Changeset 2280

Timestamp:

2008-07-25 07:33:40 (6 months ago)

Author:

fredck

Message:

Fixed #2390 : Fixed the issue where indent styles in JavaScript-generated <p> blocks are erased in IE.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckxhtml_ie.js (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js

@@ -30 +30 @@
 FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node, nodeName )
 {
-        var aAttributes = htmlNode.attributes ;
+        var aAttributes = htmlNode.attributes,
+                bHasStyle ;
 
         for ( var n = 0 ; n < aAttributes.length ; n++ )
@@ -48 +49 @@
                         else if ( sAttName == 'style' )
                         {
-                                var data = FCKTools.ProtectFormStyles( htmlNode ) ;
-                                sAttValue = htmlNode.style.cssText.replace( FCKRegexLib.StyleProperties, FCKTools.ToLowerCase ) ;
-                                FCKTools.RestoreFormStyles( htmlNode, data ) ;
+                                // Just mark it to do it later in this function.
+                                bHasStyle = true ;
+                                continue ;
                         }
                         // There are two cases when the oAttribute.nodeValue must be used:
@@ -81 +82 @@
                 }
         }
+
+        // IE loses the style attribute in JavaScript-created elements tags. (#2390) 
+        if ( bHasStyle || htmlNode.style.cssText.length > 0 )
+        {
+                var data = FCKTools.ProtectFormStyles( htmlNode ) ;
+                var sStyleValue = htmlNode.style.cssText.replace( FCKRegexLib.StyleProperties, FCKTools.ToLowerCase ) ;
+                FCKTools.RestoreFormStyles( htmlNode, data ) ;
+                this._AppendAttribute( node, 'style', sStyleValue ) ;
+        }
 }
 

FCKeditor/trunk/_whatsnew.html

@@ -108 +108 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2387">#2387</a>] Fixed JavaScript
                         with list commands when the editable document is selected with Ctrl-A.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2390">#2390</a>] Fixed the issue where 
+                        indent styles in JavaScript-generated &lt;p&gt; blocks are erased in IE.</li> 
         </ul>
         <p>