Ticket #3450: 3450_2.patch

_source/core/dom/element.js

@@ -430 +430 @@
 
                                                 case 'style':
                                                         // IE does not return inline styles via getAttribute(). See #2947.
-                                                        return this.$.style.cssText;
+                                                        var styleText = this.$.style.cssText;
+                                                        styleText.toLowerCase();
+                                                        styleText.replace( /\s+/g, '' );
+                                                        styleText.replace( /\s*(?:;\s*|$)/, ';');
+                                                        styleText.replace( /([^;])$/, '$1;');
+                                                        return styleText;
                                         }
 
                                         return standard.call( this, name );

_source/plugins/styles/plugin.js

@@ -197 +213 @@
                                         {
                                                 if ( attName == '_length' )
                                                         continue;
-
-                                                if ( compareAttributeValues(attName, attribs[attName], element.getAttribute( attName ) ) )
+                                                if ( attribs[attName] == element.getAttribute( attName ) )
                                                 {
                                                         if ( !fullMatch )
                                                                 return true;
@@ -269 +284 @@
                 // Browsers make some changes to the style when applying them. So, here
                 // we normalize it to the browser format.
                 if ( stylesText.length )
-                {
                         stylesText = normalizeCssText( stylesText );
-
-                        if ( stylesText.length )
-                                stylesText = stylesText.replace( semicolonFixRegex, ';' );
-                }
-
+                
                 // Return it, saving it to the next request.
                 return ( styleDefinition._ST = stylesText );
         };
@@ -889 +893 @@
                 }
         }
 
-        var spacesRegex = /\s+/g;
-
         // Returns an object that can be used for style matching comparison.
         // Attributes names and values are all lowercased, and the styles get
         // merged with the style attribute.
@@ -918 +920 @@
 
                 // Includes the style definitions.
                 var styleText = CKEDITOR.style.getStyleText( styleDefinition );
-                if ( styleText.length > 0 )
+                if ( styleText )
                 {
                         if ( !attribs[ 'style' ] )
                                 length++;
-
-                        attribs['style'] = styleText.replace( spacesRegex, '' ).toLowerCase();
+                        attribs[ 'style' ] = styleText;
                 }
 
                 // Appends the "length" information to the object.
@@ -1001 +1002 @@
         {
                 // Injects the style in a temporary span object, so the browser parses it,
                 // retrieving its final format.
-                var tempSpan = document.createElement( 'span' );
-                tempSpan.style.cssText = unparsedCssText;
-                return tempSpan.style.cssText;
-        }
-
-        // valueA is our internal "for comparison" value.
-        // valueB is the value retrieved from the element.
-        function compareAttributeValues( attName, valueA, valueB )
-        {
-                if ( valueA == valueB || ( !valueA && !valueB ) )
-                        return true;
-                else if ( !valueA || !valueB )
-                        return false;
-
-                valueB = valueB.toLowerCase();
-
-                if ( attName == 'style' )
-                {
-                        valueB = valueB.replace( spacesRegex, '' );
-                        if ( valueB.charAt( valueB.length - 1 ) != ';' )
-                                valueB += ';';
-                }
-
-                // Return true if they match or if valueA is null and valueB is an empty string
-                return ( valueA == valueB );
+                var temp = new CKEDITOR.dom.element( 'span' );
+                temp.setAttribute( 'style', unparsedCssText );
+                return temp.getAttribute( 'style' );
         }
 
         function applyStyle( document, remove )