Ticket #6341: 6341_2.patch
File 6341_2.patch, 1.6 KB (added by , 11 years ago) |
---|
-
_source/plugins/autogrow/plugin.js
13 13 currentHeight = editor.window.getViewPaneSize().height, 14 14 newHeight; 15 15 16 // We can not use documentElement to calculate the height for IE (#6061).17 if ( CKEDITOR.env.ie )16 // We must use the body to calculate the height for IE (#6061), and we do the same for FF because of the html height workaround (#6341). 17 if ( CKEDITOR.env.ie || CKEDITOR.env.gecko ) 18 18 newHeight = doc.getBody().$.scrollHeight + 24; 19 19 else 20 20 newHeight = doc.getDocumentElement().$.offsetHeight; -
_source/plugins/wysiwygarea/plugin.js
542 542 }); 543 543 544 544 // Gecko/Webkit need some help when selecting control type elements. (#3448) 545 if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )545 if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) ) 546 546 { 547 547 domDocument.on( 'mousedown', function( ev ) 548 548 { … … 554 554 555 555 if ( CKEDITOR.env.gecko ) 556 556 { 557 // Set the HTML style to 100% to have the text cursor in affect (#6341) 558 domDocument.getDocumentElement().setStyle( 'height', '100%' ); 557 559 domDocument.on( 'mouseup', function( ev ) 558 560 { 559 561 if ( ev.data.$.button == 2 )