Changeset 1559

Timestamp:

02/19/08 09:23:57 (5 years ago)

Author:

martinkou

Message:

Fixed #1355 : Linebreaks and spaces are now conserved when converting to and from the "Formatted" format.

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/classes/fckhtmliterator.js (added)
• editor/_source/classes/fckstyle.js (modified) (4 diffs)
• editor/_source/internals/fckregexlib.js (modified) (1 diff)
• editor/fckeditor.html (modified) (1 diff)
• fckpackager.xml (modified) (2 diffs)

FCKeditor/trunk/_whatsnew.html

@@ -103 +103 @@
                         which occurs in the Find/Replace dialog when the user presses "Find" or "Replace" after the "No
                         match found" message has appeared.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1355">#1355</a>] Linebreaks and spaces are now
+                        conserved when converting to and from the "Formatted" format.</li>
         </ul>
         <p>

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

@@ -748 +748 @@
 
         /**
+         * Converting from a PRE block to a non-PRE block in formatting operations.
+         */
+        _FromPre : function( doc, block, newBlock )
+        {
+                var innerHTML = block.innerHTML ;
+
+                // Trim the first and last linebreaks immediately after and before <pre>, </pre>,
+                // if they exist.
+                // This is done because the linebreaks are not rendered.
+                innerHTML = innerHTML.replace( /(\r\n|\r)/g, '\n' ) ;
+                innerHTML = innerHTML.replace( /^[ \t]*\n/, '' ) ;
+                innerHTML = innerHTML.replace( /\n$/, '' ) ;
+
+                // 1. Convert spaces or tabs at the beginning or at the end to &nbsp;
+                innerHTML = innerHTML.replace( /^[ \t]+|[ \t]+$/g, function( match, offset, s )
+                                {
+                                        if ( match.length == 1 )        // one space, preserve it
+                                                return '&nbsp;' ;
+                                        else if ( offset == 0 )         // beginning of block
+                                                return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+                                        else                            // end of block
+                                                return ' ' + new Array( match.length ).join( '&nbsp;' ) ;
+                                } ) ;
+
+                // 2. Convert \n to <BR>.
+                // 3. Convert contiguous (i.e. non-singular) spaces or tabs to &nbsp;
+                var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+                var results = [] ;
+                htmlIterator.Each( function( isTag, value )
+                        {
+                                if ( !isTag )
+                                {
+                                        value = value.replace( /\n/g, '<BR>' ) ;
+                                        value = value.replace( /[ \t]{2,}/g, 
+                                                        function ( match )
+                                                        {
+                                                                return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+                                                        } ) ;
+                                }
+                                results.push( value ) ;
+                        } ) ;
+                newBlock.innerHTML = results.join( '' ) ;
+                return newBlock ;
+        },
+
+        /**
+         * Converting from a non-PRE block to a PRE block in formatting operations.
+         */
+        _ToPre : function( doc, block, newBlock )
+        {
+                // Handle converting from a regular block to a <pre> block.
+                var innerHTML = block.innerHTML.Trim() ;
+
+                // 1. Delete ANSI whitespaces immediately before and after <BR> because they are not visible.
+                // 2. Mark down any <BR /> nodes here so they can be turned into \n in the next step and avoid being compressed.
+                innerHTML = innerHTML.replace( /[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi, '<BR />' ) ;
+
+                // 3. Compress other ANSI whitespaces since they're only visible as one single space previously.
+                // 4. Convert &nbsp; to spaces since &nbsp; is no longer needed in <PRE>.
+                // 5. Convert any <BR /> to \n. This must not be done earlier because the \n would then get compressed.
+                var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+                var results = [] ;
+                htmlIterator.Each( function( isTag, value )
+                        {
+                                if ( !isTag )
+                                        value = value.replace( /([ \t\n\r]+|&nbsp;)/g, ' ' ) ;
+                                else if ( isTag && value == '<BR />' )
+                                        value = '\n' ;
+                                results.push( value ) ;
+                        } ) ;
+
+                // Assigning innerHTML to <PRE> in IE causes all linebreaks to be reduced to spaces.
+                // Assigning outerHTML to <PRE> in IE doesn't work if the <PRE> isn't contained in another node
+                // since the node reference is changed after outerHTML assignment.
+                // So, we need some hacks to workaround IE bugs here.
+                if ( FCKBrowserInfo.IsIE )
+                {
+                        var temp = doc.createElement( 'div' ) ;
+                        temp.appendChild( newBlock ) ;
+                        newBlock.outerHTML = '<PRE>\n' + results.join( '' ) + '</PRE>' ;
+                        newBlock = temp.removeChild( temp.firstChild ) ;
+                }
+                else
+                        newBlock.innerHTML = results.join( '' ) ;
+                return newBlock ;
+        },
+
+        /**
          * Apply an inline style to a FCKDomRange.
          *
@@ -760 +848 @@
 
                 if ( selectIt )
-                        bookmark = range.CreateBookmark( true ) ;
+                        bookmark = range.CreateBookmark() ;
 
                 var iterator = new FCKDomRangeIterator( range ) ;
@@ -766 +854 @@
 
                 var block ;
+                var doc = range.Window.document ;
+
                 while( ( block = iterator.GetNextParagraph() ) )                // Only one =
                 {
                         // Create the new node right before the current one.
-                        var newBlock = block.parentNode.insertBefore( this.BuildElement( range.Window.document ), block ) ;
+                        var newBlock = this.BuildElement( doc ) ;
 
                         // Move everything from the current node to the new one.
-                        FCKDomTools.MoveChildren( block, newBlock ) ;
-
-                        // Delete the current node.
+                        var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
+                        var blockIsPre = block.nodeName.IEquals( 'pre' ) ;
+                        if ( newBlockIsPre && !blockIsPre )
+                                newBlock = this._ToPre( doc, block, newBlock ) ;
+                        else if ( !newBlockIsPre && blockIsPre )
+                                newBlock = this._FromPre( doc, block, newBlock ) ;
+                        else    // Convering from a regular block to another regular block.
+                                FCKDomTools.MoveChildren( block, newBlock ) ;
+
+                        // Replace the current block.
+                        block.parentNode.insertBefore( newBlock, block ) ;
                         FCKDomTools.RemoveNode( block ) ;
                 }
@@ -783 +881 @@
 
                 if ( updateRange )
-                        range.MoveToBookmark( range ) ;
+                        range.MoveToBookmark( bookmark ) ;
         },
 

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

@@ -94 +94 @@
 StyleVariableAttName : /#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,
 
-RegExp : /^\/(.*)\/([gim]*)$/
+RegExp : /^\/(.*)\/([gim]*)$/,
+
+HtmlTag : /<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/
 } ;

FCKeditor/trunk/editor/fckeditor.html

@@ -187 +187 @@
 LoadScript( '_source/classes/fckcontextmenu.js' ) ;
 LoadScript( '_source/internals/fck_contextmenu.js' ) ;
+LoadScript( '_source/classes/fckhtmliterator.js' ) ;
 LoadScript( '_source/classes/fckplugin.js' ) ;
 LoadScript( '_source/internals/fckplugins.js' ) ;

FCKeditor/trunk/fckpackager.xml

@@ -158 +158 @@
                 <File path="editor/_source/classes/fckcontextmenu.js" />
                 <File path="editor/_source/internals/fck_contextmenu.js" />
+                <File path="editor/_source/class/fckhtmliterator.js" />
 
                 <File path="editor/_source/classes/fckplugin.js" />
@@ -253 +254 @@
                 <File path="editor/_source/classes/fckcontextmenu.js" />
                 <File path="editor/_source/internals/fck_contextmenu.js" />
+                <File path="editor/_source/class/fckhtmliterator.js" />
 
                 <File path="editor/_source/classes/fckplugin.js" />