Ticket #3759: 3759.patch

_source/plugins/find/dialogs/find.js

@@ -426 +426 @@
                 var finder = {
                         searchRange : null,
                         matchRange : null,
+//                      lastPattern : null,  // The last searched pattern.
+//                      fullCoverage : null,    // Is the document content been fully searched?
+                        replaceCounter : 0, //Record how much replacement occurred when 'replace all'.
                         find : function( pattern, matchCase, matchWord, matchCyclic )
                         {
                                 if( !this.matchRange )
@@ -438 +441 @@
                                         this.matchRange.removeHighlight();
                                         this.matchRange = this.matchRange.getNextCharacterRange( pattern.length );
                                 }
-
+                                // Necessary cleanup when search pattern changed.
+                                if ( pattern != this.lastPattern )
+                                {
+                                        this.lastPattern = pattern;
+                                        this.fullCoverage = null;
+                                }
                                 var matcher = new kmpMatcher( pattern, !matchCase ),
                                         matchState = KMP_NOMATCH,
                                         character = '%';
@@ -478 +486 @@
 
                                 this.matchRange.clearMatched();
                                 this.matchRange.removeHighlight();
-                                // Clear current session and restart with the default search
-                                // range.
-                                if ( matchCyclic )
+                                // On 'cyclic', clear current session and restart with
+                                // the rest of content in document.
+                                if ( matchCyclic && !this.fullCoverage )
                                 {
-                                        this.searchRange = getSearchRange( true );
+                                        this.searchRange = getSearchRange( null, this.searchRange.startContainer );
+                                        this.fullCoverage = true;
                                         this.matchRange = null;
+                                        return this.find.apply( this, Array.prototype.slice.call( arguments ) );
                                 }
 
                                 return false;
                         },
 
-                        /**
-                         * Record how much replacement occurred toward one replacing.
-                         */
-                        replaceCounter : 0,
-
                         replace : function( dialog, pattern, newString, matchCase, matchWord,
                                 matchCyclic, matchReplaceAll )
                         {
-                                // Successiveness of current replace/find.
+
+                                // Success of current replace/find.
                                 var result = false;
 
                                 // 1. Perform the replace when there's already a match here.
@@ -530 +536 @@
                                 else
                                         result = this.find( pattern, matchCase, matchWord, matchCyclic );
                                 
-                                // Recusively replace all matches.
+                                // Recursively replace all matches.
                                 if ( matchReplaceAll && result )
                                         this.replace.apply( this, Array.prototype.slice.call( arguments ) );
 
@@ -540 +546 @@
                 };
 
                 /**
-                 * The range in which find/replace happened, receive from user
-                 * selection prior.
+                 * The range in which find/replace happened.
                  */
-                function getSearchRange( isDefault )
+                function getSearchRange( start, end )
                 {
-                        var searchRange,
-                                sel = editor.getSelection(),
-                                body = editor.document.getBody();
-                        if ( sel && !isDefault )
-                        {
-                                searchRange = sel.getRanges()[ 0 ].clone();
-                                searchRange.collapse( true );
-                        }
-                        else
-                        {
-                                searchRange = new CKEDITOR.dom.range();
-                                searchRange.setStartAt( body, CKEDITOR.POSITION_AFTER_START );
-                        }
-                        searchRange.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+                        var doc = editor.document,
+                                searchRange = new CKEDITOR.dom.range( doc ),
+                                body = doc.getBody();
+                        searchRange.setStartAt( start || body, CKEDITOR.POSITION_AFTER_START );
+                        searchRange.setEndAt( end || body, CKEDITOR.POSITION_BEFORE_END );
                         return searchRange;
                 }
 
@@ -698 +694 @@
                                                                                 var replaceNums;
 
                                                                                 finder.replaceCounter = 0;
+                                                                                finder.fullCoverage = null; 
                                                                                 if ( ( replaceNums = finder.replace( dialog,
                                                                                         dialog.getValueOf( 'replace', 'txtFindReplace' ),
                                                                                         dialog.getValueOf( 'replace', 'txtReplace' ),
@@ -794 +791 @@
                         },
                         onShow : function()
                         {
-                                // Establish initial searching start position.
-                                finder.searchRange = getSearchRange();
+                                // Initialize search range with document selection.
+                                var sel = editor.getSelection();
+                                finder.searchRange = getSearchRange( sel && sel.getStartElement() );
 
                                 if ( startupPage == 'replace' )
                                         this.getContentElement( 'replace', 'txtFindReplace' ).focus();