Changeset 612

Timestamp:

2007-08-01 11:57:56 (16 months ago)

Author:

martinkou

Message:

Fix for #338 : Fixed the issue where dropped data objects are pasted outside of the editor window in IE.
Fix for #338 : Added the FCKConfig.ShowDropDialog option.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck_gecko.js (modified) (1 diff)
• editor/_source/internals/fck_ie.js (modified) (2 diffs)
• fckconfig.js (modified) (1 diff)

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

@@ -55 +55 @@
                                 FCK.InsertHtml( text ) ;
                         }
-                        else
+                        else if ( FCKConfig.ShowDropDialog )
                                 FCK.PasteAsPlainText() ;
                 }
-                else
+                else if ( FCKConfig.ShowDropDialog )
                         FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ;
                 evt.preventDefault() ;

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

@@ -105 +105 @@
         var evt = FCK.EditorWindow.event ;
         if ( FCKConfig.ForcePasteAsPlainText )
-                FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ;
+        {
+                if ( FCK._CheckIsPastingEnabled() || FCKConfig.ShowDropDialog )
+                        FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ;
+        }
         else
-                FCKTools.RunFunction( FCKDialog.OpenDialog, FCKDialog, ['FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security'] ) ;
+        {
+                if ( FCKConfig.ShowDropDialog ) 
+                        FCKTools.RunFunction( FCKDialog.OpenDialog, 
+                                FCKDialog, ['FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security'] ) ;
+        }
         evt.returnValue = false ;
         evt.cancelBubble = true ;
-}
-
-function Doc_CancelDragDefault()
-{
-        if ( FCK._MouseDownFlag ) 
-                return ;
-        FCK.EditorWindow.event.returnValue = false ;
 }
 
@@ -129 +129 @@
 
         // Intercept drop operations
-        this.EditorDocument.body.attachEvent( 'ondragenter', Doc_CancelDragDefault ) ;
-        this.EditorDocument.body.attachEvent( 'ondragover', Doc_CancelDragDefault ) ;
         this.EditorDocument.body.attachEvent( 'ondrop', Doc_OnDrop ) ;
 

FCKeditor/trunk/fckconfig.js

@@ -79 +79 @@
 FCKConfig.ForcePasteAsPlainText = false ;
 FCKConfig.AutoDetectPasteFromWord = true ;      // IE only.
+FCKConfig.ShowDropDialog = true ;
 FCKConfig.ForceSimpleAmpersand  = false ;
 FCKConfig.TabSpaces             = 0 ;