Ticket #2597: 2597.patch

_whatsnew.html

@@ -91 +91 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2516">#2516</a>] Replaced the
                         extension AddItem of Array with the standard "push" method.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically splitting
-                        cell with colspan > 1 breaks table layout.</li>                         
+                        cell with colspan &gt; 1 breaks table layout.</li>                      
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2597">#2597</a>] Fixed the issue
+                        where dropping contents from outside of the editor doesn't work in Safari.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/_source/internals/fck_gecko.js

@@ -229 +229 @@
         }
         else if ( FCKBrowserInfo.IsSafari )
         {
-                var cancelHandler = function( evt ){ if ( ! FCK.MouseDownFlag ) evt.returnValue = false ; }
-                this.EditorDocument.addEventListener( 'dragenter', cancelHandler, true ) ;
-                this.EditorDocument.addEventListener( 'dragover', cancelHandler, true ) ;
+                this.EditorDocument.addEventListener( 'dragover', function ( evt )
+                                { if ( !FCK.MouseDownFlag && FCK.Config.ForcePasteAsPlainText ) evt.returnValue = false ; }, true ) ;
                 this.EditorDocument.addEventListener( 'drop', this._ExecDrop, true ) ;
                 this.EditorDocument.addEventListener( 'mousedown',
                         function( ev )