Ticket #2150: 2150_4.patch

_whatsnew.html

@@ -39 +39 @@
         <ul>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2142">#2142</a>] HTML samples will
                 now use sampleposteddata.php in action parameter inside a form.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2150">#2150</a>] The searching
+                        speed of the Find/Replace dialog has been vastly improved.</li>
         </ul>
         <p>
                 Fixed Bugs:</p>
@@ -68 +70 @@
                         class=&quot;Apple-style-span&quot;&gt; created after inserting special characters.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2170">#2170</a>] Fixed Ctrl-Insert hotkey
                         for copying.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2159">#2159</a>] Selection are now
+                        correctly restored when undoing changes made by the Replace dialog.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2160">#2160</a>] "Match whole word" in the
+                        Find and Replace dialog will now find words next to punctuation marks as well.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/dialog/fck_replace.html

@@ -34 +34 @@
 var dialogArguments = dialog.Args() ;
 
 var FCKLang = oEditor.FCKLang ;
+var FCKDomTools = oEditor.FCKDomTools ;
+var FCKDomRange = oEditor.FCKDomRange ;
+var FCKListsLib = oEditor.FCKListsLib ;
+var FCKTools = oEditor.FCKTools ;
+var EditorDocument = oEditor.FCK.EditorDocument ;
+var HighlightStyle = oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' )  ;
 
 dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
 dialog.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
@@ -51 +57 @@
                 dialog.SetAutoSize( true ) ;
 }
 
-// Place a range at the start of document.
-// This will be the starting point of our search.
-var GlobalRange = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-
-function ResetGlobalRange()
+GetNextNonEmptyTextNode = function( node, stopNode )
 {
-        GlobalRange.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
-        GlobalRange.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
-        GlobalRange.Collapse( true ) ;
+        var node ;
+        while ( ( node = FCKDomTools.GetNextSourceNode( node, false, 3, stopNode ) ) && node && node.length < 1 ) ;
+        return node ;
 }
-ResetGlobalRange() ;
 
-var HighlightRange = null ;
-function Highlight()
+CharacterCursor = function( arg )
 {
-        if ( HighlightRange )
-                ClearHighlight() ;
-        var cloneRange = GlobalRange.Clone() ;
-        oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).ApplyToRange( cloneRange, false, true ) ;
-        HighlightRange = cloneRange ;
-        GlobalRange = HighlightRange.Clone() ;
-}
-
-function ClearHighlight()
-{
-        if ( HighlightRange )
+        if ( arg.nodeType && arg.nodeType == 9 )
         {
-                oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).RemoveFromRange( HighlightRange, false, true ) ;
-                HighlightRange = null ;
+                this._textNode = GetNextNonEmptyTextNode( arg.body, arg.documentElement ) ;
+                this._offset = 0 ;
+                this._doc = arg ;
         }
+        else
+        {
+                this._textNode = arguments[0] ;
+                this._offset = arguments[1] ;
+                this._doc = FCKTools.GetElementDocument( arguments[0] ) ;
+        }
 }
-
-function OnLoad()
+CharacterCursor.prototype =
 {
-        // First of all, translate the dialog box texts.
-        oEditor.FCKLanguageManager.TranslatePage( document ) ;
+        GetCharacter : function()
+        {
+                return ( this._textNode && this._textNode.nodeValue.charAt( this._offset ) ) || null ;
+        },
 
-        // Show the appropriate tab at startup.
-        if ( dialogArguments.CustomValue == 'Find' )
+        // Non-normalized.
+        GetTextNode : function()
         {
-                dialog.SetSelectedTab( 'Find' ) ;
-                dialog.SetAutoSize( true ) ;
-        }
-        else
-                dialog.SetSelectedTab( 'Replace' ) ;
+                return this._textNode ;
+        },
 
-        SelectField( 'txtFind' + dialogArguments.CustomValue ) ;
-}
+        // Non-normalized.
+        GetIndex : function()
+        {
+                return this._offset ;
+        },
 
-function btnStat()
-{
-        GetE('btnReplace').disabled =
-                GetE('btnReplaceAll').disabled =
-                        GetE('btnFind').disabled =
-                                ( GetE(idMap["FindText"]).value.length == 0 ) ;
-}
+        // Return value means whehther we've crossed a line break or a paragraph boundary.
+        MoveNext : function()
+        {
+                if ( this._offset < this._textNode.length - 1 )
+                {
+                        this._offset++ ;
+                        return false ;
+                }
 
-function btnStatDelayed()
-{
-        setTimeout( btnStat, 1 ) ;
-}
+                var crossed = false ;
+                var curNode = this._textNode ;
+                while ( ( curNode = FCKDomTools.GetNextSourceNode( curNode ) )
+                                && curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) )
+                {
+                        var tag = curNode.nodeName.toLowerCase() ;
+                        if ( FCKListsLib.BlockElements[tag] || tag == 'br' )
+                                crossed = true ;
+                }
 
-function GetSearchString()
-{
-        return GetE(idMap['FindText']).value ;
-}
+                this._textNode = curNode ;
+                this._offset = 0 ;
+                return crossed ;
+        },
 
-function GetReplaceString()
-{
-        return GetE("txtReplace").value ;
-}
+        // Return value means whehther we've crossed a line break or a paragraph boundary.
+        MoveBack : function()
+        {
+                if ( this._offset > 0 && this._textNode.length > 0 )
+                {
+                        this._offset = Math.min( this._offset - 1, this._textNode.length - 1 ) ;
+                        return false ;
+                }
 
-function GetCheckCase()
-{
-        return !! ( GetE(idMap['CheckCase']).checked ) ;
-}
+                var crossed = false ;
+                var curNode = this._textNode ;
+                while ( ( curNode = FCKDomTools.GetPreviousSourceNode( curNode ) )
+                                && curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) )
+                {
+                        var tag = curNode.nodeName.toLowerCase() ;
+                        if ( FCKListsLib.BlockElements[tag] || tag == 'br' )
+                                crossed = true ;
+                }
 
-function GetMatchWord()
+                this._textNode = curNode ;
+                this._offset = curNode.length - 1 ;
+                return crossed ;
+        },
+
+        Clone : function()
+        {
+                return new CharacterCursor( this._textNode, this._offset ) ;
+        }
+} ;
+
+CharacterRange = function( initCursor, maxLength )
 {
-        return !! ( GetE(idMap['CheckWord']).checked ) ;
+        this._cursors = initCursor.push ? initCursor : [initCursor] ;
+        this._maxLength = maxLength ;
+        this._highlightRange = null ;
 }
-
-// Get the data pointed to by a bookmark.
-function GetData( bookmark )
+CharacterRange.prototype =
 {
-        var cursor = oEditor.FCK.EditorDocument.documentElement ;
-        for ( var i = 0 ; i < bookmark.length ; i++ )
+        ToDomRange : function()
         {
-                var target = bookmark[i] ;
-                var currentIndex = -1 ;
-                if ( cursor.nodeType != 3 )
+                var firstCursor = this._cursors[0] ;
+                var lastCursor = this._cursors[ this._cursors.length - 1 ] ;
+                var domRange = new FCKDomRange( FCKTools.GetElementWindow( firstCursor.GetTextNode() ) ) ;
+                var w3cRange = domRange._Range = domRange.CreateRange() ;
+                w3cRange.setStart( firstCursor.GetTextNode(), firstCursor.GetIndex() ) ;
+                w3cRange.setEnd( lastCursor.GetTextNode(), lastCursor.GetIndex() + 1 ) ;
+                domRange._UpdateElementInfo() ;
+                return domRange ;
+        },
+
+        Highlight : function()
+        {
+                if ( this._cursors.length < 1 )
+                        return ;
+
+                var domRange = this.ToDomRange() ;
+                HighlightStyle.ApplyToRange( domRange, false, true ) ;
+                this._highlightRange = domRange ;
+
+                var charRange = CharacterRange.CreateFromDomRange( domRange ) ;
+                var focusNode = domRange.StartNode ;
+                if ( focusNode.nodeType != 1 )
+                        focusNode = focusNode.parentNode ;
+                focusNode.scrollIntoView( false ) ;
+                this._cursors = charRange._cursors ;
+        },
+
+        RemoveHighlight : function()
+        {
+                if ( this._highlightRange )
                 {
-                        for (var j = 0 ; j < cursor.childNodes.length ; j++ )
-                        {
-                                var candidate = cursor.childNodes[j] ;
-                                if ( candidate.nodeType == 3 &&
-                                                candidate.previousSibling &&
-                                                candidate.previousSibling.nodeType == 3 )
-                                        continue ;
-                                currentIndex++ ;
-                                if ( currentIndex == target )
-                                {
-                                        cursor = candidate ;
-                                        break ;
-                                }
-                        }
-                        if ( currentIndex < target )
-                                return null ;
+                        HighlightStyle.RemoveFromRange( this._highlightRange, false, true ) ;
+                        var charRange = CharacterRange.CreateFromDomRange( this._highlightRange ) ;
+                        this._cursors = charRange._cursors ;
+                        this._highlightRange = null ;
                 }
-                else
-                {
-                        if ( i != bookmark.length - 1 )
-                                return null ;
-                        while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 )
-                        {
-                                target -= cursor.length ;
-                                cursor = cursor.nextSibling ;
-                        }
-                        cursor = cursor.nodeValue.charAt( target ) ;
-                        if ( cursor == "" )
-                                cursor = null ;
-                }
+        },
+
+        GetHighlightDomRange : function()
+        {
+                return this._highlightRange;
+        },
+
+        MoveNext : function()
+        {
+                var next = this._cursors[ this._cursors.length - 1 ].Clone() ;
+                var retval = next.MoveNext() ;
+                if ( retval )
+                        this._cursors = [] ;
+                this._cursors.push( next ) ;
+                if ( this._cursors.length > this._maxLength )
+                        this._cursors.shift() ;
+                return retval ;
+        },
+
+        MoveBack : function()
+        {
+                var prev = this._cursors[0].Clone() ;
+                var retval = prev.MoveBack() ;
+                if ( retval )
+                        this._cursors = [] ;
+                this._cursors.unshift( prev ) ;
+                if ( this._cursors.length > this._maxLength )
+                        this._cursors.pop() ;
+                return retval ;
+        },
+
+        GetEndCharacter : function()
+        {
+                if ( this._cursors.length < 1 )
+                        return null ;
+                var retval = this._cursors[ this._cursors.length - 1 ].GetCharacter() ;
+                return retval ;
+        },
+
+        GetNextRange : function( len )
+        {               
+                if ( this._cursors.length == 0 )
+                        return null ;
+                var cur = this._cursors[ this._cursors.length - 1 ].Clone() ;
+                cur.MoveNext() ;
+                return new CharacterRange( cur, len ) ;
+        },
+
+        GetCursors : function()
+        {
+                return this._cursors ;
         }
-        return cursor ;
-}
+} ;
 
-// With this function, we can treat the bookmark as an iterator for DFS.
-function NextPosition( bookmark )
+CharacterRange.CreateFromDomRange = function( domRange )
 {
-        // See if there's anything further down the tree.
-        var next = bookmark.concat( [0] ) ;
-        if ( GetData( next ) != null )
-                return next ;
+        var w3cRange = domRange._Range ;
+        var startContainer = w3cRange.startContainer ;
+        var endContainer = w3cRange.endContainer ;
+        var startTextNode, startIndex, endTextNode, endIndex ;
 
-        // Nothing down there? See if there's anything next to me.
-        var next = bookmark.slice( 0, bookmark.length - 1 ).concat( [ bookmark[ bookmark.length - 1 ] + 1 ] ) ;
-        if ( GetData( next ) != null )
-                return next ;
+        if ( startContainer.nodeType == 3 )
+        {
+                startTextNode = startContainer ;
+                startIndex = w3cRange.startOffset ;
+        }
+        else if ( domRange.StartNode.nodeType == 3 )
+        {
+                startTextNode = domRange.StartNode ;
+                startIndex = 0 ;
+        }
+        else
+        {
+                startTextNode = GetNextNonEmptyTextNode( domRange.StartNode, domRange.StartNode.parentNode ) ;
+                if ( !startTextNode )
+                        return null ;
+                startIndex = 0 ;
+        }
 
-        // Nothing even next to me? See if there's anything next to my ancestors.
-        for ( var i = bookmark.length - 1 ; i > 0 ; i-- )
+        if ( endContainer.nodeType == 3 && w3cRange.endOffset > 0 )
         {
-                var next = bookmark.slice( 0, i - 1 ).concat( [ bookmark[ i - 1 ] + 1 ] ) ;
-                if ( GetData( next ) != null )
-                        return next ;
+                endTextNode = endContainer ;
+                endIndex = w3cRange.endOffset - 1 ;
         }
+        else
+        {
+                endTextNode = domRange.EndNode ;
+                while ( endTextNode.nodeType != 3 )
+                        endTextNode = endTextNode.lastChild ;
+                endIndex = endTextNode.length - 1 ;
+        }
 
-        // There's absolutely nothing left to walk, return null.
-        return null ;
-}
-
-// Is this character a unicode whitespace?
-// Reference: http://unicode.org/Public/UNIDATA/PropList.txt
-function CheckIsWhitespace( c )
-{
-        var code = c.charCodeAt( 0 );
-        if ( code >= 9 && code <= 0xd )
-                return true;
-        if ( code >= 0x2000 && code <= 0x200a )
-                return true;
-        switch ( code )
+        var cursors = [] ;
+        var current = new CharacterCursor( startTextNode, startIndex ) ;
+        cursors.push( current ) ;
+        if ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) )
         {
-                case 0x20:
-                case 0x85:
-                case 0xa0:
-                case 0x1680:
-                case 0x180e:
-                case 0x2028:
-                case 0x2029:
-                case 0x202f:
-                case 0x205f:
-                case 0x3000:
-                        return true;
-                default:
-                        return false;
+                do
+                {
+                        current = current.Clone() ;
+                        current.MoveNext() ;
+                        cursors.push( current ) ;
+                }
+                while ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) ) ;
         }
+
+        return new CharacterRange( cursors, cursors.length ) ;
 }
 
 // Knuth-Morris-Pratt Algorithm for stream input
 KMP_NOMATCH = 0 ;
 KMP_ADVANCED = 1 ;
 KMP_MATCHED = 2 ;
-function KmpMatch( pattern, ignoreCase )
+KmpMatch = function( pattern, ignoreCase )
 {
         var overlap = [ -1 ] ;
         for ( var i = 0 ; i < pattern.length ; i++ )
@@ -251 +329 @@
                 this.Pattern = pattern ;
 }
 KmpMatch.prototype = {
-        "FeedCharacter" : function( c )
+        FeedCharacter : function( c )
         {
                 if ( this._IgnoreCase )
                         c = c.toLowerCase();
@@ -277 +355 @@
 
                 return null ;
         },
-        "Reset" : function()
+
+        Reset : function()
         {
                 this._State = 0 ;
         }
 };
 
-function _Find()
+// Place a range at the start of document.
+function OnLoad()
 {
-        // Start from the end of the current selection.
-        var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ;
-        var cursor = GlobalRange.CreateBookmark2().End ;
-        var matchState = KMP_NOMATCH ;
-        var matchBookmark = null ;
-        var matchBookmarkStart = [] ;
+        // First of all, translate the dialog box texts.
+        oEditor.FCKLanguageManager.TranslatePage( document ) ;
 
-        // Match finding.
-        while ( true )
+        // Show the appropriate tab at startup.
+        if ( dialogArguments.CustomValue == 'Find' )
         {
-                // Perform KMP stream matching.
-                //      - Reset KMP matcher if we encountered a block element.
-                var data = GetData( cursor ) ;
-                if ( data )
-                {
-                        if ( data.tagName )
-                        {
-                                if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] )
-                                {
-                                        matcher.Reset();
-                                        matchBookmarkStart = [] ;
-                                }
-                        }
-                        else if ( data.charAt != undefined )
-                        {
-                                matchState = matcher.FeedCharacter(data) ;
+                dialog.SetSelectedTab( 'Find' ) ;
+                dialog.SetAutoSize( true ) ;
+        }
+        else
+                dialog.SetSelectedTab( 'Replace' ) ;
 
-                                // No possible match of any useful substring in the pattern for the currently scanned character.
-                                // So delete any positional information.
-                                if ( matchState == KMP_NOMATCH )
-                                        matchBookmarkStart = [] ;
-                                // We've matched something, but it's not a complete match, so let's just mark down the position for backtracking later.
-                                else if ( matchState == KMP_ADVANCED )
-                                {
-                                        matchBookmarkStart.push( cursor.concat( [] ) ) ;
-                                        if ( matchBookmarkStart.length > matcher._State )
-                                                matchBookmarkStart.shift() ;
-                                }
-                                // Found a complete match! Mark down the ending position as well.
-                                else if ( matchState == KMP_MATCHED )
-                                {
-                                        // It is possible to get a KMP_MATCHED without KMP_ADVANCED when the match pattern is only 1 character.
-                                        // So need to check and mark down the starting position as well.
-                                        if ( matchBookmarkStart.length == 0 )
-                                                matchBookmarkStart = [cursor.concat( [] )] ;
+        SelectField( 'txtFind' + dialogArguments.CustomValue ) ;
+}
 
-                                        matchBookmark = { 'Start' : matchBookmarkStart.shift(), 'End' : cursor.concat( [] ) } ;
-                                        matchBookmark.End[ matchBookmark.End.length - 1 ]++;
+function btnStat()
+{
+        GetE('btnReplace').disabled =
+                GetE('btnReplaceAll').disabled =
+                        GetE('btnFind').disabled =
+                                ( GetE(idMap["FindText"]).value.length == 0 ) ;
+}
 
-                                        // Wait, do we have to match a whole word?
-                                        // If yes, carry out additional checks on what we've got.
-                                        if ( GetMatchWord() )
-                                        {
-                                                var startOk = false ;
-                                                var endOk = false ;
-                                                var start = matchBookmark.Start ;
-                                                var end = matchBookmark.End ;
-                                                if ( start[ start.length - 1 ] == 0 )
-                                                        startOk = true ;
-                                                else
-                                                {
-                                                        var cursorBeforeStart = start.slice( 0, start.length - 1 ) ;
-                                                        cursorBeforeStart.push( start[ start.length - 1 ] - 1 ) ;
-                                                        var dataBeforeStart = GetData( cursorBeforeStart ) ;
-                                                        if ( dataBeforeStart == null || dataBeforeStart.charAt == undefined )
-                                                                startOk = true ;
-                                                        else if ( CheckIsWhitespace( dataBeforeStart ) )
-                                                                startOk = true ;
-                                                }
+function btnStatDelayed()
+{
+        setTimeout( btnStat, 1 ) ;
+}
 
-                                                // this is already one character beyond the last char, no need to move
-                                                var cursorAfterEnd = end ;
-                                                var dataAfterEnd = GetData( cursorAfterEnd );
-                                                if ( dataAfterEnd == null || dataAfterEnd.charAt == undefined )
-                                                        endOk = true ;
-                                                else if ( CheckIsWhitespace( dataAfterEnd ) )
-                                                        endOk = true ;
+function GetSearchString()
+{
+        return GetE(idMap['FindText']).value ;
+}
 
-                                                if ( startOk && endOk )
-                                                        break ;
-                                                else
-                                                        matcher.Reset() ;
-                                        }
-                                        else
-                                                break ;
-                                }
-                        }
-                }
+function GetReplaceString()
+{
+        return GetE("txtReplace").value ;
+}
 
-                // Perform DFS across the document, until we've reached the end.
-                cursor = NextPosition( cursor ) ;
-                if ( cursor == null )
-                        break;
+function GetCheckCase()
+{
+        return !! ( GetE(idMap['CheckCase']).checked ) ;
+}
+
+function GetMatchWord()
+{
+        return !! ( GetE(idMap['CheckWord']).checked ) ;
+}
+
+/* Is this character a unicode whitespace or a punctuation mark?
+ * References:
+ * http://unicode.org/Public/UNIDATA/PropList.txt (whitespaces)
+ * http://php.chinaunix.net/manual/tw/ref.regex.php (punctuation marks)
+ */
+function CheckIsWordSeparator( c )
+{
+        var code = c.charCodeAt( 0 );
+        if ( code >= 9 && code <= 0xd )
+                return true;
+        if ( code >= 0x2000 && code <= 0x200a )
+                return true;
+        switch ( code )
+        {
+                case 0x20:
+                case 0x85:
+                case 0xa0:
+                case 0x1680:
+                case 0x180e:
+                case 0x2028:
+                case 0x2029:
+                case 0x202f:
+                case 0x205f:
+                case 0x3000:
+  &