Ticket #7915: 7915.patch

_source/plugins/iframe/dialogs/iframe.js

@@ -35 +35 @@
                         value = this.getValue();
                 if ( isRemove )
                         iframeNode.removeAttribute( this.att || this.id );
+                else if ( this.id == 'height' || this.id == 'width' )
+                        iframeNode.setStyle( this.id, value );
                 else if ( isCheckbox )
                         iframeNode.setAttribute( this.id, checkboxValues[ this.id ][ value ] );
                 else

_source/plugins/iframe/plugin.js

@@ -8 +8 @@
         function createFakeElement( editor, realElement )
         {
                 var fakeElement = editor.createFakeParserElement( realElement, 'cke_iframe', 'iframe', true ),
-                        fakeStyle = fakeElement.attributes.style || '';
+                        fakeStyle = fakeElement.attributes.style || '',
+                        realStyle = new CKEDITOR.htmlParser.style( realElement.attributes.style ).rules;
 
-                var width = realElement.attributes.width,
-                        height = realElement.attributes.height;
+                var width = realStyle && realStyle.width,
+                        height = realStyle && realStyle.height;
 
                 if ( typeof width != 'undefined' )
                         fakeStyle += 'width:' + CKEDITOR.tools.cssLength( width ) + ';';

_source/core/htmlparser/element.js

@@ -60 +60 @@
         };
 };
 
+CKEDITOR.htmlParser.style = function( styleText )
+{
+        var rules = {};
+
+   // html-encoded quote might be introduced by 'font-family'
+   // from MS-Word which confused the following regexp. e.g.
+   //'font-family: "Lucida, Console"'
+   ( styleText || '' )
+           .replace( /"/g, '"' )
+           .replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,
+                        function( match, name, value )
+                        {
+                                name == 'font-family' && ( value = value.replace( /["']/g, '' ) );
+                                rules[ name.toLowerCase() ] = value;
+                        });
+
+        return {
+                rules : rules,
+                toString :function()
+                {
+                        var output = [];
+                        for ( var i in rules )
+                                output.push( i, ':', rules[ i], ';' );
+                        return output.join( '' );
+                }
+        };
+};
+
 (function()
 {
         // Used to sort attribute entries in an array, where the first element of

_source/plugins/fakeobjects/plugin.js

@@ -20 +20 @@
                                 // the real element.
                                 if ( realElement && element.attributes[ 'data-cke-resizable' ] )
                                 {
-                                        var style = element.attributes.style;
+                                        var style = new CKEDITOR.htmlParser.style( element.attributes.style ).rules,
+                                                width = style.width,
+                                                height = style.height;
 
-                                        if ( style )
-                                        {
-                                                // Get the width from the style.
-                                                var match = /(?:^|\s)width\s*:\s*(.*?)(:?;|$)/i.exec( style ),
-                                                        width = match && match[1];
+                                        var realStyle = new CKEDITOR.htmlParser.style( realElement.attributes.style );
 
-                                                // Get the height from the style.
-                                                match = /(?:^|\s)height\s*:\s*(.*?)(:?;|$)/i.exec( style );
-                                                var height = match && match[1];
-
-                                                if ( width )
-                                                        realElement.attributes.width = width;
-
-                                                if ( height )
-                                                        realElement.attributes.height = height;
-                                        }
-                                }
+                                        width && ( realStyle.rules.width = width );
+                                        height && ( realStyle.rules.height = height );
+                                        realElement.attributes.style = realStyle.toString();
+                                }
 
                                 return realElement;
                         }