Ticket #3077: 3077_2.patch

_source/core/tools.js

@@ -387 +387 @@
                 {
                         return function() { return func.apply( obj, arguments ); };
                 },
-
+                
+                /**
+                 * Class creation based on prototype inheritance, with supports of the
+                 * following features:
+                 * <ul>
+                 * <li> Static fields </li>
+                 * <li> Private fields </li>
+                 * <li> Public(prototype) fields </li>
+                 * <li> Chainable base class constructor </li>
+                 * </ul>
+                 * 
+                 * @param {Object} definiton (Optional)The class definiton object.
+                 */
                 createClass : function( definition )
                 {
-                        var $ = definition.$,
+                        definition = definition || {};
+                        var $ = definition.$ || function(){},
                                 baseClass = definition.base,
                                 privates = definition.privates || definition._,
                                 proto = definition.proto,
@@ -401 +414 @@
                                 var originalConstructor = $;
                                 $ = function()
                                 {
-                                        originalConstructor.apply( this, arguments );
-                                        
                                         // Create (and get) the private namespace.
                                         var _ = this._ || ( this._ = {} );
                                         
@@ -415 +426 @@
                                                 _[ privateName ] = 
                                                         ( typeof priv == 'function' ) ? CKEDITOR.tools.bind( priv, this ) : priv;
                                         }
+                                        
+                                        originalConstructor.apply( this, arguments );
                                 };
                         }
 
@@ -421 +434 @@
                         if ( baseClass )
                         {
                                 $.prototype = this.prototypedCopy( baseClass.prototype );
+                                $.prototype.constructor = $;
 
                                 $.prototype.base = function()
                                 {

_source/plugins/menu/plugin.js

@@ -51 +51 @@
                         this.editor = editor;
                         this.items = [];
 
-                        this._ =
-                        {
-                                level : level || 1
-                        };
+                        this._.level = level || 1;
                 },
 
                 _ :

_source/plugins/contextmenu/plugin.js

@@ -19 +19 @@
         {
                 this.id = 'cke_' + CKEDITOR.tools.getNextNumber();
                 this.editor = editor;
-                this._ =
-                {
-                        listeners : [],
-
-                        functionId : CKEDITOR.tools.addFunction( function( commandName )
-                                {
-                                        this._.panel.hide();
-                                        editor.focus();
-                                        editor.execCommand( commandName );
-                                },
-                                this)
-                }
+                this._.listeners = [];
+                this._.functionId = CKEDITOR.tools.addFunction( function( commandName )
+                        {
+                                this._.panel.hide();
+                                editor.focus();
+                                editor.execCommand( commandName );
+                        },
+                        this);
         },
 
         _ :

_source/plugins/listblock/plugin.js

@@ -25 +25 @@
 
                                         this.multiSelect = !!multiSelect;
 
-                                        this._ =
-                                        {
-                                                pendingHtml : [],
-                                                items : {},
-                                                groups : {}
-                                        };
+                                        this._.pendingHtml = [];
+                                        this._.items = {};
+                                        this._.groups = {};
                                 },
 
                                 _ :