Ticket #1344: 1344_2.patch
File 1344_2.patch, 3.4 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
115 115 Enter in an <o:p> tag in IE does not generate line breaks.</li> 116 116 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/481">#481</a>] Fixed the issue where the image 117 117 preview in image dialog sometimes doesn't display after selecting the image from server browser.</li> 118 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1344">#1344</a>] Added warning message on 119 Copy, Cut and Paste operation failure on IE due to paste permission settings.</li> 118 120 </ul> 119 121 <p> 120 122 <a href="_whatsnew_history.html">See previous versions history</a> -
editor/_source/commandclasses/fck_othercommands.js
406 406 { 407 407 Execute : function() 408 408 { 409 if ( FCKBrowserInfo.IsIE && !FCK._CheckIsPastingEnabled() ) 410 { 411 alert( FCKLang.PasteErrorCopy ) ; 412 return ; 413 } 409 414 FCK.ExecuteNamedCommand( this.Name ) ; 410 415 }, 411 416 … … 418 423 } 419 424 }; 420 425 426 // FCKCutCommand 427 var FCKCutCommand = function() 428 { 429 this.Name = 'Cut' ; 430 } 431 432 FCKCutCommand.prototype = 433 { 434 Execute : function() 435 { 436 if ( FCKBrowserInfo.IsIE && !FCK._CheckIsPastingEnabled() ) 437 { 438 alert( FCKLang.PasteErrorCut ) ; 439 return ; 440 } 441 FCK.ExecuteNamedCommand( this.Name ) ; 442 }, 443 444 GetState : function() 445 { 446 if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) 447 return FCK_TRISTATE_DISABLED ; 448 return FCK.GetNamedCommandState( 'Cut' ) ; 449 } 450 }; 451 452 421 453 var FCKAnchorDeleteCommand = function() 422 454 { 423 455 this.Name = 'AnchorDelete' ; -
editor/_source/internals/fck_ie.js
304 304 305 305 FCK._CheckIsPastingEnabled = function( returnContents ) 306 306 { 307 if ( !returnContents ) 308 return FCK.EditorWindow.clipboardData.getData( 'Text' ) !== undefined ; 309 307 310 // The following seams to be the only reliable way to check is script 308 311 // pasting operations are enabled in the security settings of IE6 and IE7. 309 312 // It adds a little bit of overhead to the check, but so far that's the … … 319 322 320 323 document.body.detachEvent( 'onpaste', FCK_CheckPasting_Listener ) ; 321 324 322 if ( FCK._PasteIsEnabled ) 323 { 324 if ( !returnContents ) 325 oReturn = true ; 326 } 327 else 325 if ( !FCK._PasteIsEnabled ) 328 326 oReturn = false ; 329 327 330 328 delete FCK._PasteIsEnabled ; -
editor/_source/internals/fckcommands.js
127 127 case 'Undo' : oCommand = new FCKUndoCommand() ; break ; 128 128 case 'Redo' : oCommand = new FCKRedoCommand() ; break ; 129 129 case 'Copy' : oCommand = new FCKCopyCommand() ; break ; 130 case 'Cut' : oCommand = new FCKCutCommand() ; break ; 130 131 131 132 case 'SelectAll' : oCommand = new FCKSelectAllCommand() ; break ; 132 133 case 'InsertOrderedList' : oCommand = new FCKListCommand( 'insertorderedlist', 'ol' ) ; break ;