Ticket #3810: 3810.patch
File 3810.patch, 1.9 KB (added by , 15 years ago) |
---|
-
_source/plugins/wysiwygarea/plugin.js
394 394 395 395 setTimeout( function() 396 396 { 397 editor.fire( 'contentDom' );398 399 if ( fireMode )400 {401 editor.mode = 'wysiwyg';402 editor.fire( 'mode' );403 fireMode = false;404 }405 406 397 isLoadingData = false; 407 398 408 399 if ( isPendingFocus ) … … 431 422 } 432 423 }, 1000 ); 433 424 } 425 426 // Fire below events after document has gain focus if any.(#3810) 427 editor.fire( 'contentDom' ); 428 429 if ( fireMode ) 430 { 431 editor.mode = 'wysiwyg'; 432 editor.fire( 'mode' ); 433 fireMode = false; 434 } 434 435 }, 435 436 0 ); 436 437 }; -
_source/plugins/templates/dialogs/templates.js
79 79 var dialog = CKEDITOR.dialog.getCurrent(), 80 80 isInsert = dialog.getValueOf( 'selectTpl', 'chkInsertOpt' ); 81 81 82 // Template content as new page. 82 83 if( isInsert ) 83 84 { 85 86 // Drop current selection. 87 if ( CKEDITOR.env.ie ) 88 editor.getSelection().unlock(); 89 90 // Close dialog after new document has initialized.(#3810) 91 editor.on( 'contentDom', function( evt ){ 92 evt.removeListener(); 93 dialog.hide(); 94 } ); 84 95 editor.setData( html ); 85 96 } 86 97 else 87 98 { 88 99 editor.insertHtml( html ); 89 } 90 91 dialog.hide(); 92 } 100 dialog.hide(); 101 } 102 } 93 103 94 104 CKEDITOR.dialog.add( 'templates', function( editor ) 95 105 {