Changeset 1066

Timestamp:

2007-11-04 13:30:20 (2 years ago)

Author:

alfonsoml

Message:

Fix for #1500, the OnSelectionChange listeners did accumulate on each New Page call.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckevents.js (modified) (1 diff)
• internals/fck_gecko.js (modified) (3 diffs)
• internals/fck.js (modified) (2 diffs)

FCKeditor/trunk/editor/_source/classes/fckevents.js

@@ -35 +35 @@
                 this._RegisteredEvents[ eventName ] = [ functionPointer ] ;
         else
-                aTargets.push( functionPointer ) ;
+        {
+                // Check that the event handler isn't already registered with the same listener
+                // It doesn't detect function pointers belonging to an object (at least in Gecko)
+                if ( aTargets.IndexOf( functionPointer ) == -1 )
+                        aTargets.push( functionPointer ) ;
+        }
 }
 

FCKeditor/trunk/editor/_source/internals/fck_gecko.js

@@ -197 +197 @@
         }
 
-        this._FillEmptyBlock = function( emptyBlockNode )
-        {
-                if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 )
-                        return ;
-                var nodeTag = emptyBlockNode.tagName.toLowerCase() ;
-                if ( nodeTag != 'p' && nodeTag != 'div' )
-                        return ;
-                if ( emptyBlockNode.firstChild )
-                        return ;
-                FCKTools.AppendBogusBr( emptyBlockNode ) ;
-        }
-
-        this._ExecCheckEmptyBlock = function()
-        {
-                FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
-                var sel = FCK.EditorWindow.getSelection() ;
-                if ( !sel || sel.rangeCount < 1 )
-                        return ;
-                var range = sel.getRangeAt( 0 );
-                FCK._FillEmptyBlock( range.startContainer ) ;
-        }
-
         this.ExecOnSelectionChangeTimer = function()
         {
@@ -286 +264 @@
                 this.EditorDocument.addEventListener( 'click', this._ExecCheckCaret, false ) ;
         }
-        if ( FCKBrowserInfo.IsGecko )
-                this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ;
 
         // Reset the context menu.
@@ -457 +433 @@
         return aCreatedLinks ;
 }
+
+FCK._FillEmptyBlock = function( emptyBlockNode )
+{
+        if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 )
+                return ;
+        var nodeTag = emptyBlockNode.tagName.toLowerCase() ;
+        if ( nodeTag != 'p' && nodeTag != 'div' )
+                return ;
+        if ( emptyBlockNode.firstChild )
+                return ;
+        FCKTools.AppendBogusBr( emptyBlockNode ) ;
+}
+
+FCK._ExecCheckEmptyBlock = function()
+{
+        FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
+        var sel = FCK.EditorWindow.getSelection() ;
+        if ( !sel || sel.rangeCount < 1 )
+                return ;
+        var range = sel.getRangeAt( 0 );
+        FCK._FillEmptyBlock( range.startContainer ) ;
+}

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -105 +105 @@
                 // Tab key handling for source mode.
                 FCKTools.AddEventListener( document, "keydown", this._TabKeyHandler ) ;
+
+                // Add selection change listeners. They must be attached only once.
+                this.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ;
+                if ( FCKBrowserInfo.IsGecko )
+                        this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ;
+
         },
 
@@ -811 +817 @@
 
         FCK.InitializeBehaviors() ;
-        FCK.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ;
 
         // Listen for mousedown and mouseup events for tracking drag and drops.