Ticket #3450: 3450_4.patch

_source/plugins/styles/plugin.js

@@ -197 +197 @@
                                         {
                                                 if ( attName == '_length' )
                                                         continue;
-
-                                                if ( compareAttributeValues(attName, attribs[attName], element.getAttribute( attName ) ) )
+                                                if ( attribs[attName] == element.getAttribute( attName ) )
                                                 {
                                                         if ( !fullMatch )
                                                                 return true;
@@ -269 +268 @@
                 // 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 +883 @@
                 }
         }
 
-        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
@@ -912 +905 @@
                         for ( var styleAtt in styleAttribs )
                         {
                                 length++;
-                                attribs[ styleAtt.toLowerCase() ] = styleAttribs[ styleAtt ].toLowerCase();
+                                attribs[ styleAtt ] = styleAttribs[ styleAtt ];
                         }
                 }
 
                 // 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 +993 @@
         {
                 // 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;
+                var temp = new CKEDITOR.dom.element( 'span' );
+                temp.setAttribute( 'style', unparsedCssText );
+                return temp.getAttribute( 'style' );
         }
 
-        // 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 );
-        }
-
         function applyStyle( document, remove )
         {
                 // Get all ranges from the selection.

_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;
+                                                        return styleText.toLowerCase().replace(
+                                                                /\s*(?:;\s*|$)/, ';').replace(
+                                                                        /([^;])$/, '$1;');
                                         }
 
                                         return standard.call( this, name );

_source/tests/core/dom/element.html

@@ -172 +172 @@
                         var element = new CKEDITOR.dom.element( document.getElementById( 'test1' ) );
                         element.setAttribute( 'style', 'position: absolute;' );
 
-                        assert.areEqual( 'position:absolute', document.getElementById( 'test1' ).style.cssText.replace( /[\s;]/g, '' ).toLowerCase() );
+                        assert.areEqual( 'position: absolute;', element.getAttribute( 'style' ) );
                 },
 
                 test_setAttribute3 : function()
@@ -201 +201 @@
                                 'rows'  : 5 });
 
                         assert.areSame( 'Test', document.getElementById( 'test1' ).className, 'class is wrong' );
-                        assert.areEqual( 'position:absolute', document.getElementById( 'test1' ).style.cssText.replace( /[\s;]/g, '' ).toLowerCase(), 'style is wrong' );
+                        assert.areEqual( 'position: absolute;', element.getAttribute( 'style'), 'style is wrong' );
                         assert.areEqual( 'TestName', document.getElementById( 'test1' ).name, 'name is wrong' );
                         assert.areEqual( 5, document.getElementById( 'test1' ).rows, 'rows is wrong' );
                 },
@@ -414 +414 @@
                         assert.areEqual( 'hasExpando', element.getAttribute( 'class' ), 'class is wrong' );
                         element.removeAttribute( 'class' );
 
-                        assert.areEqual( 'float:right', element.getAttribute( 'style' ).toLowerCase().replace( /[ ;]/g, '' ) );
+                        assert.areEqual( 'float: right;', element.getAttribute( 'style' ) );
 
                         element.removeAttribute( 'style' );
                         element.removeAttribute( 'id' );