Ticket #6339: 6339.patch
File 6339.patch, 1.6 KB (added by , 14 years ago) |
---|
-
_source/plugins/autogrow/plugin.js
37 37 { 38 38 init : function( editor ) 39 39 { 40 for ( var eventName in { contentDom:1, key:1, selectionChange:1, insertElement:1 } )40 for ( var eventName in { contentDom:1, key:1, selectionChange:1, insertElement:1, resize:1 } ) 41 41 { 42 42 editor.on( eventName, function( evt ) 43 43 { 44 // Disable autogrow when the editor is maximized .(#6339) 45 if ( eventName == 'resize' && ( !evt.data || !evt.data.ev || evt.data.ev != 'minimize' ) ) 46 return; 44 47 // Some time is required for insertHtml, and it gives other events better performance as well. 45 if ( evt.editor.mode == 'wysiwyg' )48 if ( evt.editor.mode == 'wysiwyg' && !evt.editor.container.getChild( 1 ).hasClass( 'cke_maximized' ) ) 46 49 setTimeout( function(){ resizeEditor( evt.editor ); }, 100 ); 47 50 }); 48 51 } -
_source/plugins/maximize/plugin.js
280 280 281 281 // Emit a resize event, because this time the size is modified in 282 282 // restoreStyles. 283 editor.fire( 'resize' ); 283 // Attach data that notifies that the event was triggered on minimize. (#6339) 284 editor.fire( 'resize', { ev : 'minimize' } ); 284 285 } 285 286 286 287 this.toggleState();