Ticket #1715: 1715.patch
File 1715.patch, 1.9 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
45 45 <ul> 46 46 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1643">#1643</a>] Resolved 47 47 several "strict warning" messages in Firefox when running FCKeditor.</li> 48 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1715">#1715</a>] The ShowDropDialog 49 is now enforced only when ForcePasteAsPlainText = true.</li> 48 50 </ul> 49 51 <p> 50 52 <a href="_whatsnew_history.html">See previous versions history</a> -
editor/_source/internals/fck_gecko.js
57 57 else if ( FCKConfig.ShowDropDialog ) 58 58 FCK.PasteAsPlainText() ; 59 59 } 60 else if ( FCKConfig.ShowDropDialog ) 61 FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ; 60 else 61 return ; 62 62 63 evt.preventDefault() ; 63 64 evt.stopPropagation() ; 64 65 } -
editor/_source/internals/fck_ie.js
109 109 { 110 110 if ( FCK._CheckIsPastingEnabled() || FCKConfig.ShowDropDialog ) 111 111 FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ; 112 113 evt.returnValue = false ; 114 evt.cancelBubble = true ; 112 115 } 113 else114 {115 if ( FCKConfig.ShowDropDialog )116 FCKTools.RunFunction( FCKDialog.OpenDialog,117 FCKDialog, ['FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security'] ) ;118 }119 evt.returnValue = false ;120 evt.cancelBubble = true ;121 116 } 122 117 123 118 FCK.InitializeBehaviors = function( dontReturn )