Ticket #2156: 2156_3.patch

_whatsnew.html

@@ -50 +50 @@
                         About plugin shows misleading user language</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2821">#2821</a>] Configuration
                         items that used floating point numbers were parsed as integers.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2156">#2156</a>] 
+                        After calling GetData() the style removal operations didn't work in IE.</li>
                 <li>Language file updates for the following languages:
                         <ul>
                                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2849">#2849</a>] Lithuanian</li>

editor/_source/internals/fckdomtools.js

@@ -488 +488 @@
 
                 for ( var i = 0 ; i < attributes.length ; i++ )
                 {
-                        if ( FCKBrowserInfo.IsIE && attributes[i].nodeName == 'class' )
+                        if ( FCKBrowserInfo.IsIE ) 
                         {
-                                // IE has a strange bug. If calling removeAttribute('className'),
-                                // the attributes collection will still contain the "class"
-                                // attribute, which will be marked as "specified", even if the
-                                // 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 ( element.className.length > 0 )
-                                        return true ;
+                                var attributeNodeName = attributes[i].nodeName ;
+
+                                if ( attributeNodeName.StartsWith( '_fck' ) ) 
+                                {
+                                        /**
+                                         * There are places in the FCKeditor code where HTML element objects
+                                         * get values stored as properties (e.g. _fckxhtmljob).  In Internet 
+                                         * Explorer, these are interpreted as attempts to set attributes on
+                                         * the element.  
+                                         *
+                                         * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr
+                                         *
+                                         * Counting these as HTML attributes cripples 
+                                         * FCK.Style.RemoveFromRange() once FCK.GetData() has been called.
+                                         *
+                                         * The above conditional prevents these internal properties being 
+                                         * counted as attributes.
+                                         *
+                                         * refs #2156 and #2834
+                                         */
+
+                                        continue ;
+                                }
+
+                                if ( attributeNodeName == 'class' ) 
+                                {
+                                        // IE has a strange bug. If calling removeAttribute('className'),
+                                        // the attributes collection will still contain the "class"
+                                        // attribute, which will be marked as "specified", even if the
+                                        // 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 ( element.className.length > 0 )
+                                                return true ;
+                                        continue ;
+                                }
                         }
-                        else if ( attributes[i].specified )
+                        if ( attributes[i].specified )
                                 return true ;
                 }
 

editor/_source/internals/fckxhtml.js

@@ -56 +56 @@
         else
                 this._AppendChildNodes( this.MainNode, node, false ) ;
 
+        /**
+         * FCKXHtml._AppendNode() marks DOM element objects it has 
+         * processed by adding a property called _fckxhtmljob, 
+         * setting it equal to the value of FCKXHtml.CurrentJobNum.  
+         * On Internet Explorer, if an element object has such a 
+         * property,  it will show up in the object's attributes 
+         * NamedNodeMap, and the corresponding Attr object in 
+         * that collection  will have is specified property set 
+         * to true.  This trips up code elsewhere that checks to 
+         * see if an element is free of attributes before proceeding 
+         * with an edit operation (c.f. FCK.Style.RemoveFromRange())
+         *      
+         * refs #2156 and #2834
+         */
+        if ( FCKBrowserInfo.IsIE )
+                FCKXHtml._RemoveXHtmlJobProperties( node ) ;
+
         // Get the resulting XHTML as a string.
         var sXHTML = this._GetMainXmlString() ;
 

editor/_source/internals/fckxhtml_ie.js

@@ -92 +92 @@
         }
 }
 
+/**
+ * Used to clean up HTML that has been processed FCKXHtml._AppendNode().
+ *
+ * For objects corresponding to HTML elements, Internet Explorer will 
+ * treat a property as if it were an attribute set on that element.
+ *
+ * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr
+ *
+ * FCKXHtml._AppendNode() sets the property _fckxhtmljob on node objects
+ * corresponding HTML elements to mark them as having been processed.
+ * Counting these properties as attributes will cripple style removal
+ * because FCK.Styles.RemoveFromSelection() will not remove an element
+ * as long as it still has attributes.
+ *
+ * refs #2156 and #2834
+ */
+
+FCKXHtml._RemoveXHtmlJobProperties = function ( node ) 
+{
+        // Select only nodes of type ELEMENT_NODE
+        if (!node || !node.nodeType || node.nodeType != 1)
+                return ;
+
+        // Clear the _fckhtmljob attribute.
+        if ( typeof node._fckxhtmljob !== 'undefined' )
+                node.removeAttribute('_fckxhtmljob') ;
+
+        // Recurse upon child nodes.
+        if ( node.hasChildNodes() ) 
+        {
+                var childNodes = node.childNodes ;
+                for ( var i = childNodes.length - 1 ; i >= 0 ; i-- ) 
+                        FCKXHtml._RemoveXHtmlJobProperties( childNodes.item(i) ) ;
+        }
+}
+
 // On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list)
 FCKXHtml.TagProcessors['div'] = function( node, htmlNode )
 {