Ticket #3549: 3549_4.patch

_source/core/dom/element.js

@@ -151 +151 @@
                  */
                 removeClass : function( className )
                 {
-                        var c = this.$.className;
+                        var c = this.getAttribute( 'class' );
                         if ( c )
                         {
-                                var regex = new RegExp( '(?:^|\\s+)' + className + '(?=\\s|$)', '' );
+                                var regex = new RegExp( '(?:^|\\s+)' + className + '(?=\\s|$)', 'i' );
                                 if ( regex.test( c ) )
                                 {
                                         c = c.replace( regex, '' ).replace( /^\s+/, '' );
 
                                         if ( c )
-                                                this.$.className = c;
+                                                this.setAttribute( 'class', c );
                                         else
                                                 this.removeAttribute( 'class' );
                                 }
@@ -170 +170 @@
                 hasClass : function( className )
                 {
                         var regex = new RegExp( '(?:^|\\s+)' + className + '(?=\\s|$)', '' );
-                        return regex.test( this.$.className );
+                        return regex.test( this.getAttribute('class') );
                 },
 
                 /**
@@ -400 +400 @@
                                 return this.$.getAttribute( name, 2 );
                         };
 
-                        if ( CKEDITOR.env.ie && !CKEDITOR.env.ie8 )
+                        if ( CKEDITOR.env.ie )
                         {
                                 return function( name )
                                 {
@@ -436 +436 @@
                                                                         /([^;])$/, '$1;');
                                         }
 
-                                        return standard.call( this, name );
+                                        return typeof this.$[ name ] == 'undefined' 
+                                                ? standard.call( this, name ) : this.$[ name ];         
                                 };
                         }
                         else
@@ -767 +768 @@
                                                                 // outerHTML of the element is not displaying the class attribute.
                                                                 // Note : I was not able to reproduce it outside the editor,
                                                                 // but I've faced it while working on the TC of #1391.
-                                                                if ( this.$.className.length > 0 )
+                                                                if ( this.getAttribute( 'class' ) > 0 )
                                                                         return true;
 
                                                         // Attributes to be ignored.
@@ -870 +871 @@
                                 return this;
                         };
 
-                        if ( CKEDITOR.env.ie && !CKEDITOR.env.ie8 )
+                        if ( CKEDITOR.env.ie )
                         {
                                 return function( name, value )
                                 {
@@ -936 +937 @@
                                 this.$.removeAttribute( name );
                         };
 
-                        if ( CKEDITOR.env.ie && !CKEDITOR.env.ie8  )
+                        if ( CKEDITOR.env.ie )
                         {
                                 return function( name )
                                 {
                                         if ( name == 'class' )
+                                        {
+                                                this.className = undefined;
+                                                standard.call( this, 'class' );
                                                 name = 'className';
+                                        }
                                         else if ( name == 'tabindex' )
                                                 name = 'tabIndex';
                                         standard.call( this, name );