Changeset 589

Timestamp:

2007-07-30 06:38:36 (16 months ago)

Author:

martinkou

Message:

Fixed the issue where calling FCKDomRange.MoveToSelection() throws JavaScript errors under Safari, when the editor frame has not been selected yet.
Fixed the issue where calling FCK.InsertHtml() throws JavaScript errors under Safari, when the editor frame has not been selected yet.
Fixed #338 : Dropping data objects into the editor will now be processed as a paste, and the FCKConfig.ForcePasteAsPlainText setting will be honored.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckdomrange_gecko.js (modified) (1 diff)
• classes/fckeditingarea.js (modified) (1 diff)
• internals/fck_gecko.js (modified) (3 diffs)
• internals/fck_ie.js (modified) (4 diffs)

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

@@ -35 +35 @@
                 this._UpdateElementInfo() ;
         }
+        else
+                this.MoveToElementStart( this.Window.document.body ) ;
 }
 

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

@@ -170 +170 @@
         if ( FCKBrowserInfo.IsIE )
         {
+                // The fiddling with UNSELECTABLE is a trick for fixing an IE browser bug, don't remove.
+                // See #523 for information about the bug.
                 oDoc.body.unselectable = "on" ;
                 oDoc.body.contentEditable = true ;

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

@@ -54 +54 @@
                 FCK.Events.FireEvent( "OnMouseUp",e ) ;
         }
+
+        this._ExecDrop = function( evt )
+        {
+                if ( FCKConfig.ForcePasteAsPlainText )
+                {
+                        if ( evt.dataTransfer )
+                        {
+                                var text = evt.dataTransfer.getData( 'Text' ) ;
+                                text = FCKTools.HTMLEncode( text ) ;
+                                text = FCKTools.ProcessLineBreaks( window, FCKConfig, text ) ;
+                                FCK.InsertHtml( text ) ;
+                        }
+                        else
+                                FCK.PasteAsPlainText() ;
+                }
+                else
+                        FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ;
+                evt.preventDefault() ;
+                evt.stopPropagation() ;
+        }
+
         this.ExecOnSelectionChangeTimer = function()
         {
@@ -83 +104 @@
         this.EditorDocument.addEventListener( 'mouseup', this._ExecMouseUp, true ) ;
         this.EditorDocument.addEventListener( 'mousemove', this._ExecMouseMove, true ) ;
+
+        // Hooks for data object drops
+        if ( FCKBrowserInfo.IsGecko )
+        {
+                this.EditorWindow.captureEvents( Event.DRAGDROP ) ;
+                this.EditorWindow.addEventListener( 'dragdrop', this._ExecDrop, true ) ;
+        }
+        else if ( FCKBrowserInfo.IsSafari )
+        {
+                var cancelHandler = function( evt ){ evt.returnValue = false ; }
+                this.EditorDocument.addEventListener( 'dragenter', cancelHandler, true ) ;
+                this.EditorDocument.addEventListener( 'dragover', cancelHandler, true ) ;
+                this.EditorDocument.addEventListener( 'drop', this._ExecDrop, true ) ;
+        }
 
         // Reset the context menu.
@@ -191 +226 @@
         var oRange = oSel.getRangeAt(0) ;
 
+        // If a range is not available ( occurs under Safari )
+        // Append to the end of the editor document.
+        if ( ! oRange )
+        {
+                oRange = this.EditorDocument.createRange() ;
+                oRange.selectNodeContents( this.EditorDocument.body ) ;
+                oRange.collapse( false ) ;
+        }
+
         // Create a fragment with the input HTML.
         var oFragment = oRange.createContextualFragment( html ) ;

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

@@ -107 +107 @@
 }
 
+function Doc_OnDrop()
+{
+        var evt = FCK.EditorWindow.event ;
+        if ( FCKConfig.ForcePasteAsPlainText )
+                FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ;
+        else
+                FCKTools.RunFunction( FCKDialog.OpenDialog, FCKDialog, ['FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security'] ) ;
+        evt.returnValue = false ;
+        evt.cancelBubble = true ;
+}
+
+function Doc_CancelDefault()
+{
+        FCK.EditorWindow.event.returnValue = false ;
+}
+
 FCK.InitializeBehaviors = function( dontReturn )
 {
@@ -115 +131 @@
         // Intercept pasting operations
         this.EditorDocument.body.attachEvent( 'onpaste', Doc_OnPaste ) ;
+
+        // Intercept drop operations
+        this.EditorDocument.body.attachEvent( 'ondragenter', Doc_CancelDefault ) ;
+        this.EditorDocument.body.attachEvent( 'ondragover', Doc_CancelDefault ) ;
+        this.EditorDocument.body.attachEvent( 'ondrop', Doc_OnDrop ) ;
 
         // Reset the context menu.
@@ -251 +272 @@
 }
 
-FCK.PasteAsPlainText = function()
+FCK.PasteAsPlainText = function( forceText )
 {
         if ( !FCK._CheckIsPastingEnabled() )
@@ -260 +281 @@
 
         // Get the data available in the clipboard in text format.
-        var sText = clipboardData.getData("Text") ;
+        var sText = null ;
+        if ( ! forceText )
+                sText = clipboardData.getData("Text") ;
+        else 
+                sText = forceText ;
 
         if ( sText && sText.length > 0 )