Changeset 587

Timestamp:

2007-07-28 12:48:15 (16 months ago)

Author:

fredck

Message:

Fixed #996 : Changed the paste system to better support the OnPaste event.

Location:

FCKeditor/trunk

Files:

• editor/fckeditor.html (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (1 diff)
• editor/_source/internals/fck_ie.js (modified) (2 diffs)
• editor/_source/internals/fck.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/fckeditor.html

@@ -204 +204 @@
 // Set the editor interface direction.
 window.document.dir = FCKLang.Dir ;
-
-// Activate pasting operations.
-if ( FCKConfig.ForcePasteAsPlainText || FCKConfig.AutoDetectPasteFromWord )
-        FCK.Events.AttachEvent( 'OnPaste', FCK.Paste ) ;
 
         </script>

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

@@ -150 +150 @@
 }
 
-FCK.Paste = function()
+FCK._ExecPaste = function()
 {
         // Save a snapshot for undo before actually paste the text

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

@@ -85 +85 @@
 function Doc_OnPaste()
 {
-        return ( FCK.Status == FCK_STATUS_COMPLETE && FCK.Events.FireEvent( "OnPaste" ) ) ;
+        var body = FCK.EditorDocument.body ;
+        
+        body.detachEvent( 'onpaste', Doc_OnPaste ) ;
+
+        var ret = FCK.Paste( !FCKConfig.ForcePasteAsPlainText && !FCKConfig.AutoDetectPasteFromWord ) ;
+
+        body.attachEvent( 'onpaste', Doc_OnPaste ) ;
+        
+        return ret ;
 }
 
@@ -194 +202 @@
 }
 
-FCK.Paste = function()
+FCK._ExecPaste = function()
 {
         // As we call ExecuteNamedCommand('Paste'), it would enter in a loop. So, let's use a semaphore.

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

@@ -491 +491 @@
                 return sValue ? sValue : '' ;
         },
+        
+        Paste : function( _callListenersOnly )
+        {
+                // First call 'OnPaste' listeners.
+                if ( FCK.Status != FCK_STATUS_COMPLETE || !FCK.Events.FireEvent( 'OnPaste' ) )
+                        return false ;
+                
+                // Then call the default implementation.
+                return _callListenersOnly || FCK._ExecPaste() ;
+        },
 
         PasteFromWord : function()
@@ -814 +824 @@
                 {
                         case 'Paste' :
-                                return !FCK.Events.FireEvent( 'OnPaste' ) ;
+                                return !FCK.Paste() ;
 
                         case 'Cut' :

FCKeditor/trunk/_whatsnew.html

@@ -138 +138 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/977">#977</a>] The "shape" attribute of &lt;area&gt; had its
                         value changed to uppercase in IE.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/996">#996</a>] "OnPaste"
+                        event listeners will now get executed only once.</li>
         </ul>
         <h3>