Changes in FCKeditor/trunk/editor/_source/classes/fckstyle.js [1378:1398]

File:

• FCKeditor/trunk/editor/_source/classes/fckstyle.js (modified) (10 diffs)

FCKeditor/trunk/editor/_source/classes/fckstyle.js

@@ -95 +95 @@
          * Apply the style to a FCKDomRange.
          */
-        ApplyToRange : function( range, selectIt )
+        ApplyToRange : function( range, selectIt, updateRange )
         {
                 // ApplyToRange is not valid for FCK_STYLE_OBJECT types.
@@ -112 +112 @@
                 }
 
-                this.ApplyToRange( range, selectIt ) ;
+                this.ApplyToRange( range, selectIt, updateRange ) ;
         },
 
@@ -142 +142 @@
          * effect.
          */
-        RemoveFromRange : function( range, selectIt )
+        RemoveFromRange : function( range, selectIt, updateRange )
         {
                 var bookmark ;
@@ -277 +277 @@
                                 range.SelectBookmark( bookmark ) ;
 
-                        return ;
+                        if ( updateRange )
+                                range.MoveToBookmark( bookmark ) ;
                 }
 
@@ -402 +403 @@
                 if ( selectIt )
                         range.SelectBookmark( bookmark ) ;
+
+                if ( updateRange )
+                        range.MoveToBookmark( bookmark ) ;
         },
 
@@ -750 +754 @@
          *      - Properly handle block containers like <div> and <blockquote>.
          */
-        _ApplyBlockStyle : function( range, selectIt )
+        _ApplyBlockStyle : function( range, selectIt, updateRange )
         {
                 // Bookmark the range so we can re-select it after processing.
@@ -769 +773 @@
                         // Move everything from the current node to the new one.
                         FCKDomTools.MoveChildren( block, newBlock ) ;
+
+                        // If we're in a non-IE browser, and the newBlock is <pre>, and the old block is not <pre>,
+                        // then we need to clear linebreaks and compress ANSI whitespaces so that we don't get disrupted
+                        // output in <pre> mode. (Bug #1355)
+                        if ( !FCKBrowserInfo.IsIE && newBlock.nodeName.IEquals( 'pre' ) && !block.nodeName.IEquals( 'pre' ) )
+                        {
+                                // If the newBlock's first child is a text node, left-trim it since any ANSI whitespace 
+                                // after a non-pre block is meaningless.
+                                if ( newBlock.firstChild && newBlock.firstChild.nodeType == 3 )
+                                        newBlock.firstChild.nodeValue = newBlock.firstChild.nodeValue.LTrim() ;
+
+                                // Ditto for the last child.
+                                if ( newBlock.lastChild && newBlock.lastChild.nodeType == 3 )
+                                        newBlock.lastChild.nodeValue = newBlock.lastChild.nodeValue.RTrim() ;
+
+                                // DFS walk the newBlock to compress ANSI whitespaces and delete excessive linebreaks.
+                                var currentNode = newBlock ;
+                                while ( currentNode )
+                                {
+                                        currentNode = FCKDomTools.GetNextSourceNode( currentNode, false, 3, newBlock.parentNode ) ;
+                                        if ( currentNode )
+                                        {
+                                                // If the text node ends with a line break, and its next sibling is a <BR>,
+                                                // then right-trim the text node.
+                                                if ( currentNode.nodeValue.charAt( currentNode.nodeValue.length - 1 ) == '\n'
+                                                                && currentNode.nextSibling 
+                                                                && currentNode.nextSibling.nodeName.IEquals( 'br' ) )
+                                                        currentNode.nodeValue = currentNode.nodeValue.RTrim() ;
+                                                // If the text node begins with a line break, and its next sibling is a <BR>,
+                                                // then left-trim the text node.
+                                                if ( currentNode.nodeValue.charAt( 0 ) == '\n'
+                                                                && currentNode.previousSibling 
+                                                                && currentNode.previousSibling.nodeName.IEquals( 'br' ) )
+                                                        currentNode.nodeValue = currentNode.nodeValue.LTrim() ;
+                                                // Compress any ANSI whitespaces left.
+                                                currentNode.nodeValue = currentNode.nodeValue.replace( /[\r\n\t ]+/g, ' ' ) ;
+                                        }
+                                }
+                        }
 
                         // Delete the current node.
@@ -777 +820 @@
                 if ( selectIt )
                         range.SelectBookmark( bookmark ) ;
+
+                if ( updateRange )
+                        range.MoveToBookmark( range ) ;
         },
 
@@ -789 +835 @@
          *        <span style="color: #ff0000;"><span style="background-color: #ffffff">XYZ</span></span>
          */
-        _ApplyInlineStyle : function( range, selectIt )
+        _ApplyInlineStyle : function( range, selectIt, updateRange )
         {
                 var doc = range.Window.document ;
@@ -970 +1016 @@
                 if ( selectIt )
                         range.SelectBookmark( bookmark ) ;
+
+                if ( updateRange )
+                        range.MoveToBookmark( bookmark ) ;
         },