Ticket #3500: 3500.patch

_source/core/dom/element.js

@@ -800 +800 @@
                         :
                                 function()
                                 {
-                                        return this.$.attributes.length > 0;
+                                        var attributes = this.$.attributes;
+                                        return (attributes.length > 1 || (attributes.length==1 && attributes[0].nodeName!='_cke_expando')) ;
                                 },
 
                 /**

_source/tests/core/dom/element.html

@@ -407 +407 @@
                 test_getAttribute_ignoreExpandoAttributes : function()
                 {
                         var element = new CKEDITOR.dom.element( document.getElementById( 'testExpandoAttributes' ) );
-                        assert.areEqual( 1, element.getAttribute( 'tabindex' ) );
-                        element.removeAttribute( 'tabindex' );
+                        assert.areEqual( 1, element.getAttribute( 'tabIndex' ) );
+                        element.removeAttribute( 'tabIndex' );
                         assert.areEqual( 'hasExpando', element.getAttribute( 'class' ) );
                         element.removeAttribute( 'class' );
-                        if( CKEDITOR.env.ie )
-                                assert.areEqual( 'FLOAT: right', element.getAttribute( 'style' ) );
-                        else 
-                                assert.areEqual( 'float: right;', element.getAttribute( 'style' ) );
+
+                        var floatStyle;
+                        if ( CKEDITOR.env.gecko )
+                                floatStyle = 'float: right;';
+                        if ( CKEDITOR.env.ie )
+                                floatStyle = 'FLOAT: right';
+                        if ( CKEDITOR.env.opera )
+                                floatStyle = 'float:right';
+                        if ( CKEDITOR.env.webkit )
+                                floatStyle = 'float:right';
+        
+                        assert.areEqual( floatStyle, element.getAttribute( 'style' ) );
                         element.removeAttribute( 'style' );
                         element.removeAttribute( 'id' );
                         assert.isFalse( element.hasAttributes() );