Changeset 1449

Timestamp:

2008-01-29 10:56:01 (9 months ago)

Author:

fredck

Message:

Fixed #1715 : The ShowDropDialog is now enforced only when ForcePasteAsPlainText = true.

Location:

FCKeditor/trunk

Files:

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

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

@@ -46 +46 @@
                         return ;
                 }
+
                 if ( FCKConfig.ForcePasteAsPlainText )
                 {
@@ -57 +58 @@
                         else if ( FCKConfig.ShowDropDialog )
                                 FCK.PasteAsPlainText() ;
-                }
-                else if ( FCKConfig.ShowDropDialog )
-                        FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ;
-                evt.preventDefault() ;
-                evt.stopPropagation() ;
+
+                        evt.preventDefault() ;
+                        evt.stopPropagation() ;
+                }
         }
 

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

@@ -105 +105 @@
                 return ;
         }
-        var evt = FCK.EditorWindow.event ;
+
         if ( FCKConfig.ForcePasteAsPlainText )
         {
+                var evt = FCK.EditorWindow.event ;
+
                 if ( FCK._CheckIsPastingEnabled() || FCKConfig.ShowDropDialog )
                         FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ;
-        }
-        else
-        {
-                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 ;
+
+                evt.returnValue = false ;
+                evt.cancelBubble = true ;
+        }
 }
 

FCKeditor/trunk/_whatsnew.html

@@ -68 +68 @@
                         attached to a shared toolbar among multiple FCKeditor instances are no longer misplaced
                         when the editing areas are absolutely or relatively positioned.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1715">#1715</a>] The ShowDropDialog
+                        is now enforced only when ForcePasteAsPlainText = true.</li>
         </ul>
         <p>