Ticket #3500: 3500_2.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' ) );
                                 },
 
                 /**
@@ -954 +955 @@
                                 {
                                         if ( name == 'class' )
                                                 name = 'className';
+                                        else if ( name == 'tabindex' )
+                                                name = 'tabIndex';
                                         standard.call( this, name );
                                 };
                         }

_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' ) );
+
+                        assert.areEqual( 1, element.getAttribute( 'tabindex' ), 'tabindex is wrong' );
                         element.removeAttribute( 'tabindex' );
-                        assert.areEqual( 'hasExpando', element.getAttribute( 'class' ) );
+
+                        assert.areEqual( 'hasExpando', element.getAttribute( 'class' ), 'class is wrong' );
                         element.removeAttribute( 'class' );
-                        if( CKEDITOR.env.ie )
-                                assert.areEqual( 'FLOAT: right', element.getAttribute( 'style' ) );
-                        else
-                                assert.areEqual( 'float: right;', element.getAttribute( 'style' ) );
+
+                        assert.areEqual( 'float:right', element.getAttribute( 'style' ).toLowerCase().replace( /[ ;]/g, '' ) );
+
                         element.removeAttribute( 'style' );
                         element.removeAttribute( 'id' );
-                        assert.isFalse( element.hasAttributes() );
+                        assert.isFalse( element.hasAttributes(), 'hasAttributes should be false' );
                 },
 
                 test_getTabIndex1 : function()