Changeset 414

Timestamp:

2007-07-07 13:14:45 (17 months ago)

Author:

martinkou

Message:

Fixed #102 : HTML code generated by the "Paste As Plain Text" feature now obeys the EnterMode setting.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_paste.html (modified) (1 diff)
• editor/_source/internals/fck_ie.js (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (1 diff)
• _whatsnew.html (modified) (2 diffs)

FCKeditor/trunk/editor/dialog/fck_paste.html

@@ -102 +102 @@
         {
                 sHtml = oEditor.FCKTools.HTMLEncode( document.getElementById('txtData').value )  ;
-                sHtml = sHtml.replace( /\n/g, '<BR>' ) ;
+                sHtml = FCKTools.ProcessLineBreaks( oEditor, FCKConfig, sHtml ) ;
+
+                // FCK.InsertHtml() does not work for us, since document fragments cannot contain node fragments. :(
+                // Use the marker method instead. It's primitive, but it works.
+                var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+                var oDoc = oEditor.FCK.EditorDocument ;
+                range.MoveToSelection() ;
+                range.DeleteContents() ;
+                var marker = [] ;
+                for ( var i = 0 ; i < 5 ; i++ )
+                        marker.push( parseInt(Math.random() * 100000) ) ;
+                marker = marker.join( "" ) ;
+                range.InsertNode ( oDoc.createTextNode( marker ) ) ;
+                range.Release() ;
+
+                // Now we've got a marker indicating the paste position in the editor document.
+                // Find its position in the HTML code.
+                var htmlString = oDoc.body.innerHTML ;
+                var index = htmlString.indexOf( marker ) ;
+
+                // Split it the HTML code up, add the code we generated, and put them back together.
+                var htmlList = [] ;
+                htmlList.push( htmlString.substr( 0, index ) ) ;
+                htmlList.push( sHtml ) ;
+                htmlList.push( htmlString.substr( index + marker.length ) ) ;
+                htmlString = htmlList.join( "" ) ;
+
+                if ( oEditor.FCKBrowserInfo.IsIE )
+                        oEditor.FCK.SetInnerHtml( htmlString ) ;
+                else
+                        oDoc.body.innerHTML = htmlString ;
+
+                return true ;
         }
 

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

@@ -246 +246 @@
         {
                 // Replace the carriage returns with <BR>
-                sText = FCKTools.HTMLEncode( sText ).replace( /\n/g, '<BR>' ) ;
+                sText = FCKTools.HTMLEncode( sText ) ;
+                sText = FCKTools.ProcessLineBreaks( window, FCKConfig, sText ) ;
 
                 // Insert the resulting data in the editor.

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

@@ -111 +111 @@
 
         return text ;
+}
+
+FCKTools._ProcessLineBreaksForPMode = function( oEditor, text, liState, node, strArray )
+{
+        var closeState = 0 ;
+        var blockStartTag = "<p>" ;
+        var blockEndTag = "</p>" ;
+        var lineBreakTag = "<br />" ;
+        if ( liState )
+        {
+                blockStartTag = "<li>" ;
+                blockEndTag = "</li>" ;
+                closeState = 1 ;
+        }
+
+        // Are we currently inside a <p> tag now?
+        // If yes, close it at the next double line break.
+        while ( node && node != oEditor.FCK.EditorDocument.body )
+        {
+                if ( node.tagName.toLowerCase() == 'p' )
+                {
+                        closeState = 1 ;
+                        break;
+                }
+                node = node.parentNode ;
+        }
+
+        for ( var i = 0 ; i < text.length ; i++ )
+        {
+                var c = text.charAt( i ) ;
+                if ( c == '\r' )
+                        continue ;
+
+                if ( c != '\n' )
+                {
+                        strArray.push( c ) ;
+                        continue ;
+                }
+
+                // Now we have encountered a line break.
+                // Check if the next character is also a line break.
+                var n = text.charAt( i + 1 ) ;
+                if ( n == '\r' )
+                {
+                        i++ ;
+                        n = text.charAt( i + 1 ) ;
+                }
+                if ( n == '\n' )
+                {
+                        i++ ;   // ignore next character - we have already processed it.
+                        if ( closeState )
+                                strArray.push( blockEndTag ) ;
+                        strArray.push( blockStartTag ) ;
+                        closeState = 1 ;
+                }
+                else
+                        strArray.push( lineBreakTag ) ;
+        }
+        if ( closeState )
+                strArray.push( blockEndTag ) ;
+}
+
+FCKTools._ProcessLineBreaksForDivMode = function( oEditor, text, liState, node, strArray )
+{
+        var closeState = 0 ;
+        var blockStartTag = "<div>" ;
+        var blockEndTag = "</div>" ;
+        if ( liState )
+        {
+                blockStartTag = "<li>" ;
+                blockEndTag = "</li>" ;
+                closeState = 1 ;
+        }
+
+        // Are we currently inside a <div> tag now?
+        // If yes, close it at the next double line break.
+        while ( node && node != oEditor.FCK.EditorDocument.body )
+        {
+                if ( node.tagName.toLowerCase() == 'div' )
+                {
+                        closeState = 1 ;
+                        break ;
+                }
+                node = node.parentNode ;
+        }
+
+        for ( var i = 0 ; i < text.length ; i++ )
+        {
+                var c = text.charAt( i ) ;
+                if ( c == '\r' )
+                        continue ;
+
+                if ( c != '\n' )
+                {
+                        strArray.push( c ) ;
+                        continue ;
+                }
+
+                if ( closeState )
+                {
+                        if ( strArray[ strArray.length - 1 ] == blockStartTag )
+                        {
+                                // A div tag must have some contents inside for it to be visible.
+                                strArray.push( "&nbsp;" ) ;
+                        }
+                        strArray.push( blockEndTag ) ;
+                }
+                strArray.push( blockStartTag ) ;
+                closeState = 1 ;
+        }
+        if ( closeState )
+                strArray.push( blockEndTag ) ;
+}
+
+FCKTools._ProcessLineBreaksForBrMode = function( oEditor, text, liState, node, strArray )
+{
+        var closeState = 0 ;
+        var blockStartTag = "<br />" ;
+        var blockEndTag = "" ;
+        if ( liState )
+        {
+                blockStartTag = "<li>" ;
+                blockEndTag = "</li>" ;
+                closeState = 1 ;
+        }
+
+        for ( var i = 0 ; i < text.length ; i++ )
+        {
+                var c = text.charAt( i ) ;
+                if ( c == '\r' )
+                        continue ;
+
+                if ( c != '\n' )
+                {
+                        strArray.push( c ) ;
+                        continue ;
+                }
+
+                if ( closeState && blockEndTag.length )
+                        strArray.push ( blockEndTag ) ;
+                strArray.push( blockStartTag ) ;
+                closeState = 1 ;
+        }
+}
+
+FCKTools.ProcessLineBreaks = function( oEditor, oConfig, text )
+{
+        var enterMode = oConfig.EnterMode.toLowerCase() ;
+        var strArray = [] ;
+
+        // Is the caret or selection inside an <li> tag now?
+        var liState = 0 ;
+        var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+        range.MoveToSelection() ;
+        var node = range._Range.startContainer ;
+        while ( node && node.nodeType != 1 )
+                node = node.parentNode ;
+        if ( node && node.tagName.toLowerCase() == 'li' )
+                liState = 1 ;
+
+        if ( enterMode == 'p' )
+                this._ProcessLineBreaksForPMode( oEditor, text, liState, node, strArray ) ;
+        else if ( enterMode == 'div' )
+                this._ProcessLineBreaksForDivMode( oEditor, text, liState, node, strArray ) ;
+        else if ( enterMode == 'br' )
+                this._ProcessLineBreaksForBrMode( oEditor, text, liState, node, strArray ) ;
+        return strArray.join( "" ) ;
 }
 

FCKeditor/trunk/_whatsnew.html

@@ -58 +58 @@
                         AbsolutePath setting so it's possible to set the url to a full domain or a relative path and specify that
                         way the physical folder where the files are stored..</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/100">#100</a>] A new configuration directive
+                        "FCKConfig.EditorAreaStyles" has been implemented to allow setting editing area styles from JavaScript.
+                        </li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/102">#102</a>] HTML code generated by the "Paste
+                        As Plain Text" feature now obeys the EnterMode setting.</li>
         </ul>
         <p>
@@ -80 +85 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/560">#560</a>] The PHP connector will work better if the
                         connector or the userfiles folder is a symlink.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/802">#802</a>] The replace dialog will now advance its searching
+                        position correctly and is able to search for strings spanning across multiple inline tags.</li>
         </ul>
         <h3>