Ticket #171: 171_pre.patch

editor/_source/internals/fckxhtml.js

@@ -30 +30 @@
         FCKDomTools.CheckAndRemovePaddingNode( FCKTools.GetElementDocument( node ), FCKConfig.EnterMode ) ;
         FCKXHtmlEntities.Initialize() ;
 
+        // Random ID for protected attributes.
+        this._ProtectID = Math.random() ;
+
         // Set the correct entity to use for empty blocks.
         this._NbspEntity = ( FCKConfig.ProcessHTMLEntities? 'nbsp' : '#160' ) ;
 
@@ -59 +62 @@
         // Get the resulting XHTML as a string.
         var sXHTML = this._GetMainXmlString() ;
 
+        // Release protected attributes that could not be directly set in DOM operations previously.
+        sXHTML = sXHTML.replace( new RegExp( '_protected_' + this._ProtectID, 'g' ), '' ) ;
+
 //      alert( 'Time: ' + ( ( ( new Date() ) - dTimer ) ) + ' ms' ) ;
 
         this.XML = null ;
@@ -513 +519 @@
 } ;
 
 FCKXHtml.TagProcessors.ul = FCKXHtml.TagProcessors.ol ;
+
+FCKXHtml.AttributeProcessors =
+{
+        fck_alt_size : function( node, htmlNode, value )
+        {
+                node.attributes.removeNamedItem( 'size' ) ;
+                node.attributes.removeNamedItem( 'fck_alt_size' ) ;
+                htmlNode.removeAttribute( 'size' ) ;
+                htmlNode.removeAttribute( 'fck_alt_size' ) ;
+
+                FCKXHtml._AppendAttribute( node, 'size_protected_' + FCKXHtml._ProtectID, value ) ;
+        }
+} ;

editor/_source/internals/fckxhtml_gecko.js

@@ -60 +60 @@
                         else
                                 sAttValue = htmlNode.getAttribute( sAttName, 2 ) ;      // We must use getAttribute to get it exactly as it is defined.
 
-                        this._AppendAttribute( node, sAttName, sAttValue ) ;
+                        if ( this.AttributeProcessors[sAttName] )
+                                this.AttributeProcessors[sAttName]( node, htmlNode, sAttValue ) ;
+                        else
+                                this._AppendAttribute( node, sAttName, sAttValue ) ;
                 }
         }
 }

editor/_source/internals/fckxhtml_ie.js

@@ -77 +77 @@
                                 }
                                 catch (e) {}
                         }
-                        this._AppendAttribute( node, sAttName, sAttValue || oAttribute.nodeValue ) ;
+                        if ( this.AttributeProcessors[sAttName] )
+                                this.AttributeProcessors[sAttName]( node, htmlNode, sAttValue ) ;
+                        else
+                                this._AppendAttribute( node, sAttName, sAttValue ) ;
                 }
         }
 }
@@ -200 +203 @@
         node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
 
         return node ;
-}
- No newline at end of file
+}

editor/dialog/fck_textfield.html

@@ -46 +46 @@
         {
                 GetE('txtName').value   = oActiveEl.name ;
                 GetE('txtValue').value  = oActiveEl.value ;
-                GetE('txtSize').value   = GetAttribute( oActiveEl, 'size' ) ;
+                GetE('txtSize').value   = GetAttribute( oActiveEl, 'size' ) || GetAttribute( oActiveEl, 'fck_alt_size' ) ;
                 GetE('txtMax').value    = GetAttribute( oActiveEl, 'maxLength' ) ;
                 GetE('txtType').value   = oActiveEl.type ;
 
@@ -86 +86 @@
         oActiveEl.name = GetE('txtName').value ;
         SetAttribute( oActiveEl, 'value'        , GetE('txtValue').value ) ;
         SetAttribute( oActiveEl, 'size'         , GetE('txtSize').value ) ;
+        SetAttribute( oActiveEl, 'fck_alt_size', GetE('txtSize').value ) ;
         SetAttribute( oActiveEl, 'maxlength', GetE('txtMax').value ) ;
 
         return true ;