Ticket #1715: 1715_2.patch
File 1715_2.patch, 2.3 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
62 62 paragraphs.</li> 63 63 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1654">#1654</a>] The editor 64 64 was not loading on an specific unknown situation. The breaking point has been removed.</li> 65 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1715">#1715</a>] The ShowDropDialog 66 is now enforced only when ForcePasteAsPlainText = true.</li> 65 67 </ul> 66 68 <p> 67 69 <a href="_whatsnew_history.html">See previous versions history</a> -
editor/_source/internals/fck_gecko.js
45 45 FCK.MouseDownFlag = false ; 46 46 return ; 47 47 } 48 48 49 if ( FCKConfig.ForcePasteAsPlainText ) 49 50 { 50 51 if ( evt.dataTransfer ) … … 56 57 } 57 58 else if ( FCKConfig.ShowDropDialog ) 58 59 FCK.PasteAsPlainText() ; 60 61 evt.preventDefault() ; 62 evt.stopPropagation() ; 59 63 } 60 else if ( FCKConfig.ShowDropDialog )61 FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ;62 evt.preventDefault() ;63 evt.stopPropagation() ;64 64 } 65 65 66 66 this._ExecCheckCaret = function( evt ) -
editor/_source/internals/fck_ie.js
104 104 FCK.MouseDownFlag = false ; 105 105 return ; 106 106 } 107 var evt = FCK.EditorWindow.event ; 107 108 108 if ( FCKConfig.ForcePasteAsPlainText ) 109 109 { 110 var evt = FCK.EditorWindow.event ; 111 110 112 if ( FCK._CheckIsPastingEnabled() || FCKConfig.ShowDropDialog ) 111 113 FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ; 114 115 evt.returnValue = false ; 116 evt.cancelBubble = true ; 112 117 } 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 118 } 122 119 123 120 FCK.InitializeBehaviors = function( dontReturn )