Ticket #3978: 3978.patch

_source/core/tools.js

@@ -197 +197 @@
                  * alert( CKEDITOR.tools.cssStyleToDomStyle( 'background-color' ) );  // "backgroundColor"
                  * alert( CKEDITOR.tools.cssStyleToDomStyle( 'float' ) );             // "cssFloat"
                  */
-                cssStyleToDomStyle : function( cssName )
+                cssStyleToDomStyle : ( function()
                 {
-                        if ( cssName == 'float' )
-                                return 'cssFloat';
-                        else
-                        {
-                                return cssName.replace( /-./g, function( match )
-                                        {
-                                                return match.substr( 1 ).toUpperCase();
-                                        });
-                        }
-                },
+                        var test = document.createElement( 'div' ).style;
+
+                        var cssFloat = ( typeof test.cssFloat != 'undefined' ) ? 'cssFloat'
+                                : ( typeof test.styleFloat != 'undefined' ) ? 'styleFloat'
+                                : 'float';
+                        
+                        return function( cssName )
+                        {
+                                if ( cssName == 'float' )
+                                        return cssFloat;
+                                else
+                                {
+                                        return cssName.replace( /-./g, function( match )
+                                                {
+                                                        return match.substr( 1 ).toUpperCase();
+                                                });
+                                }
+                        };
+                } )(),
 
                 /**
                  * Replace special HTML characters in a string with their relative HTML

_source/tests/core/dom/element.html

@@ -219 +219 @@
                         var element = new CKEDITOR.dom.element( document.getElementById( 'setStyle' ) );
                         element.setStyle( 'float', 'right' );
 
-                        assert.areEqual( 'right', document.getElementById( 'setStyle' ).style.cssFloat );
+                        var key = CKEDITOR.tools.cssStyleToDomStyle( 'float' );
+                        assert.areEqual( 'right', document.getElementById( 'setStyle' ).style[ key ] );
                 },
 
+                test_setStyle3 : function()
+                {
+                        var element = new CKEDITOR.dom.element( document.getElementById( 'setStyle' ) );
+                        element.removeAttribute( 'style' );
+                        element.setStyle( 'float', 'right' );
+
+                        assert.areEqual( 'float:right', element.getAttribute( 'style' ).replace( ' ', '' ).replace( ';', '' ).toLowerCase() );
+                },
+
                 test_setStyles : function()
                 {
                         var element = new CKEDITOR.dom.element( document.getElementById( 'setStyle' ) );
@@ -230 +240 @@
                                         'float' : 'right'
                                 });
 
+                        var key = CKEDITOR.tools.cssStyleToDomStyle( 'float' );
                         assert.areEqual( 'absolute', document.getElementById( 'setStyle' ).style.position );
-                        assert.areEqual( 'right', document.getElementById( 'setStyle' ).style.cssFloat );
+                        assert.areEqual( 'right', document.getElementById( 'setStyle' ).style[ key ] );
                 },
 
                 test_setText1 : function()