Ticket #171: 171.patch

editor/_source/internals/fck.js

@@ -329 +329 @@
                 FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
         },
 
-        // Saves URLs on links and images on special attributes, so they don't change when
-        // moving around.
-        ProtectUrls : function( html )
+        // Saves special attributes that might be lost if we only assign it directly to document.body.innerHTML.
+        ProtectAttributes : function( html )
         {
                 // <A> href
                 html = html.replace( FCKRegexLib.ProtectUrlsA   , '$& _fcksavedurl=$1' ) ;
@@ -340 +339 @@
                 html = html.replace( FCKRegexLib.ProtectUrlsImg , '$& _fcksavedurl=$1' ) ;
 
                 // <AREA> href
-                html = html.replace( FCKRegexLib.ProtectUrlsArea        , '$& _fcksavedurl=$1' ) ;
+                html = html.replace( FCKRegexLib.ProtectUrlsArea, '$& _fcksavedurl=$1' ) ;
 
+                // <INPUT type="text"> size
+                html = html.replace( FCKRegexLib.ProtectSizesInput, '$& _fcksavedsize=$1' ) ;
+
+                // <TEXTAREA> cols
+                html = html.replace( FCKRegexLib.ProtectColsTextarea, '$& _fcksavedcols=$1' ) ;
+
                 return html ;
         },
 
@@ -399 +404 @@
                 // If there was an onSelectionChange listener in IE we must remove it to avoid crashes #1498
                 if ( FCKBrowserInfo.IsIE && FCK.EditorDocument )
                 {
-                                FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
+                        FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
                 }
 
                 if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
@@ -421 +426 @@
                         data = FCK.ProtectEvents( data ) ;
 
                         // Protect some things from the browser itself.
-                        data = FCK.ProtectUrls( data ) ;
+                        data = FCK.ProtectAttributes( data ) ;
                         data = FCK.ProtectTags( data ) ;
 
                         // Insert the base tag (FCKConfig.BaseHref), if not exists in the source.

editor/_source/internals/fckregexlib.js

@@ -75 +75 @@
 ProtectUrlsImg  : /<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 ProtectUrlsA    : /<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 ProtectUrlsArea : /<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectSizesInput: /<input(?=\s).*?\ssize=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectColsTextarea: /<textarea(?=\s).*?\scols=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 
 Html4DocType    : /HTML 4\.0 Transitional/i ,
 DocTypeTag              : /<!DOCTYPE[^>]*>/i ,

editor/_source/internals/fckxhtml_ie.js

@@ -130 +130 @@
         if ( htmlNode.value && !node.attributes.getNamedItem( 'value' ) )
                 FCKXHtml._AppendAttribute( node, 'value', htmlNode.value ) ;
 
+        var sSavedSize = htmlNode.getAttribute( '_fcksavedsize' ) ;
+        if ( sSavedSize != null )
+                FCKXHtml._AppendAttribute( node, 'size', sSavedSize ) ;
+
         if ( !node.attributes.getNamedItem( 'type' ) )
                 FCKXHtml._AppendAttribute( node, 'type', 'text' ) ;
 
@@ -197 +201 @@
         if ( htmlNode.name )
                 FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
 
+        var sSavedCols = htmlNode.getAttribute( '_fcksavedcols' ) ;
+        if ( sSavedCols != null )
+                FCKXHtml._AppendAttribute( node, 'cols', sSavedCols ) ;
+
         node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
 
         return node ;
-}
- No newline at end of file
+}

editor/dialog/fck_textarea.html

@@ -45 +45 @@
         if ( oActiveEl && oActiveEl.tagName == 'TEXTAREA' )
         {
                 GetE('txtName').value           = oActiveEl.name ;
-                GetE('txtCols').value           = GetAttribute( oActiveEl, 'cols' ) ;
+                GetE('txtCols').value           = GetAttribute( oActiveEl, 'cols' ) || GetAttribute( oActiveEl, '_fcksavedcols' ) ; ;
                 GetE('txtRows').value           = GetAttribute( oActiveEl, 'rows' ) ;
         }
         else
@@ -63 +63 @@
         oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'TEXTAREA', {name: GetE('txtName').value} ) ;
 
         SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;
+        SetAttribute( oActiveEl, '_fcksavedcols', GetE('txtCols').value ) ;
         SetAttribute( oActiveEl, 'rows', GetE('txtRows').value ) ;
 
         return true ;

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, '_fcksavedsize' ) ;
                 GetE('txtMax').value    = GetAttribute( oActiveEl, 'maxLength' ) ;
                 GetE('txtType').value   = oActiveEl.type ;
         }
@@ -79 +79 @@
 
         SetAttribute( oActiveEl, 'value'        , GetE('txtValue').value ) ;
         SetAttribute( oActiveEl, 'size'         , GetE('txtSize').value ) ;
+        SetAttribute( oActiveEl, '_fcksavedsize', GetE('txtSize').value ) ;
         SetAttribute( oActiveEl, 'maxlength', GetE('txtMax').value ) ;
 
         return true ;