Changeset 3119

Timestamp:

03/02/09 19:42:55 (4 years ago)

Author:

garry.yao

Message:

Fixing CKEDITOR.event duplicate event registration across multiple instances of #2927.

Location:

CKEditor/trunk/_source

Files:

• core/command.js (modified) (1 diff)
• core/dom/domobject.js (modified) (1 diff)
• core/editor_basic.js (modified) (1 diff)
• core/event.js (modified) (3 diffs)
• plugins/dialog/plugin.js (modified) (1 diff)

CKEditor/trunk/_source/core/command.js

@@ -49 +49 @@
 }
 
-CKEDITOR.event.implementOn( CKEDITOR.command.prototype );
+CKEDITOR.event.implementOn( CKEDITOR.command.prototype, true );

CKEditor/trunk/_source/core/dom/domobject.js

@@ -193 +193 @@
 
         // Implement CKEDITOR.event.
-        CKEDITOR.event.implementOn( domObjectProto );
+        CKEDITOR.event.implementOn( domObjectProto, true );
 
 })( CKEDITOR.dom.domObject.prototype );

CKEditor/trunk/_source/core/editor_basic.js

@@ -175 +175 @@
 
         // "Inherit" (copy actually) from CKEDITOR.event.
-        CKEDITOR.event.implementOn( CKEDITOR.editor.prototype );
+        CKEDITOR.event.implementOn( CKEDITOR.editor.prototype, true );
 }

CKEditor/trunk/_source/core/event.js

@@ -19 +19 @@
         CKEDITOR.event = function()
         {
-                ( this._ || ( this._ = {} ) ).events = {};
+                //In case of preserving existed events
+                var preExistedEvents = this._   && this._.events;
+                if( !preExistedEvents )
+                        ( this._ || ( this._ = {} ) ).events = {};
         };
 
@@ -25 +28 @@
          * Implements the {@link CKEDITOR.event} features in an object.
          * @param {Object} targetObject The object in which implement the features.
+         * @param {Boolean} isTargetPrototype If the target is a prototype of
+         *            constructor, the internal 'events' object will not be copied,
+         *            which should be composed by the constructor itself.
          * @example
          * var myObject = { message : 'Example' };
@@ -34 +40 @@
          * myObject.fire( 'testEvent' );
          */
-        CKEDITOR.event.implementOn = function( targetObject )
+        CKEDITOR.event.implementOn = function( targetObject , isTargetPrototype)
         {
-                CKEDITOR.event.call( targetObject );
+                if( !isTargetPrototype )
+                        CKEDITOR.event.call( targetObject );
 
                 for ( var prop in CKEDITOR.event.prototype )
                 {
-                        if ( targetObject[ prop ] == undefined )
-                                targetObject[ prop ] = CKEDITOR.event.prototype[ prop ];
+                        (function(){
+                                
+                                var property = prop;
+                                
+                                if ( targetObject[ property ] == undefined )
+                                        targetObject[ property ] = isTargetPrototype?
+                                        function()
+                                        {
+                                                //pre-setup events model 
+                                                if( ! ( this._ && this._.events ) )
+                                                        CKEDITOR.event.call( this );
+                                                
+                                                ( this[ property ] = CKEDITOR.event.prototype[ property ] )
+                                                        .apply( this, arguments );
+                                        } :
+                                        CKEDITOR.event.prototype[ property ];
+                        })();
                 }
         };

CKEditor/trunk/_source/plugins/dialog/plugin.js

@@ -1000 +1000 @@
         // "Inherit" (copy actually) from CKEDITOR.event.
         CKEDITOR.event.implementOn( CKEDITOR.dialog );
-        CKEDITOR.event.implementOn( CKEDITOR.dialog.prototype );
+        CKEDITOR.event.implementOn( CKEDITOR.dialog.prototype, true );
 
         var defaultDialogDefinition =