Ticket #6506: 6506.patch
File 6506.patch, 2.2 KB (added by , 13 years ago) |
---|
-
_source/plugins/htmldataprocessor/plugin.js
98 98 for ( i in blockLikeTags ) 99 99 defaultDataBlockFilterRules.elements[ i ] = extendBlockForDisplay; 100 100 101 var htmlHeightRegex = /((^|;)\s*height\s*\:\s*)[^\;]*(;|$)/i; 102 101 103 var defaultHtmlFilterRules = 102 104 { 103 105 elementNames : … … 182 184 { 183 185 delete element.attributes.contenteditable; 184 186 delete element.attributes[ 'class' ]; 187 188 if ( element.attributes.style ) 189 { 190 element.attributes.style = element.attributes.style.replace( htmlHeightRegex, function( m, dec, sep, ending ) 191 { 192 var realHeight = element.attributes[ '_cke_height' ]; 193 if ( !realHeight ) 194 return ''; 195 return dec + realHeight + ending; 196 }); 197 198 if ( element.attributes.style == '' ) 199 delete element.attributes.style; 200 } 185 201 }, 186 202 187 203 body : function( element ) … … 193 209 style : function( element ) 194 210 { 195 211 var child = element.children[ 0 ]; 196 child && child.value && ( child.value = CKEDITOR.tools.trim( child.value ) );212 child && child.value && ( child.value = CKEDITOR.tools.trim( child.value ) ); 197 213 198 214 if ( !element.attributes.type ) 199 215 element.attributes.type = 'text/css'; -
_source/plugins/wysiwygarea/plugin.js
556 556 if ( CKEDITOR.env.gecko ) 557 557 { 558 558 // Set the HTML style to 100% to have the text cursor in affect (#6341) 559 domDocument.getDocumentElement().setStyle( 'height', '100%' ); 559 var docElement = domDocument.getDocumentElement(), height; 560 if ( ( height = docElement.getStyle( 'height' ) ) ) 561 docElement.setAttribute( '_cke_height', height ) 562 docElement.setStyle( 'height', '100%' ); 563 560 564 domDocument.on( 'mouseup', function( ev ) 561 565 { 562 566 if ( ev.data.$.button == 2 )