Ticket #1715: 1715_2.patch

_whatsnew.html

@@ -62 +62 @@
                         paragraphs.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1654">#1654</a>] The editor
                         was not loading on an specific unknown situation. The breaking point has been removed.</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>
                 <a href="_whatsnew_history.html">See previous versions history</a>

editor/_source/internals/fck_gecko.js

@@ -45 +45 @@
                         FCK.MouseDownFlag = false ;
                         return ;
                 }
+
                 if ( FCKConfig.ForcePasteAsPlainText )
                 {
                         if ( evt.dataTransfer )
@@ -56 +57 @@
                         }
                         else if ( FCKConfig.ShowDropDialog )
                                 FCK.PasteAsPlainText() ;
+
+                        evt.preventDefault() ;
+                        evt.stopPropagation() ;
                 }
-                else if ( FCKConfig.ShowDropDialog )
-                        FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ;
-                evt.preventDefault() ;
-                evt.stopPropagation() ;
         }
 
         this._ExecCheckCaret = function( evt )

editor/_source/internals/fck_ie.js

@@ -104 +104 @@
                 FCK.MouseDownFlag = false ;
                 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' ) ) ;
+
+                evt.returnValue = false ;
+                evt.cancelBubble = true ;
         }
-        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 ;
 }
 
 FCK.InitializeBehaviors = function( dontReturn )