Ticket #3790: 3790.patch

_source/plugins/find/dialogs/find.js

@@ -496 +496 @@
                         replaceCounter : 0,
 
                         replace : function( dialog, pattern, newString, matchCase, matchWord,
-                                matchCyclic, matchReplaceAll )
+                                matchCyclic )
                         {
                                 // Successiveness of current replace/find.
                                 var result = false;
@@ -531 +531 @@
                                 else
                                         result = this.find( pattern, matchCase, matchWord, matchCyclic );
 
-                                // Recusively replace all matches.
-                                if ( matchReplaceAll && result )
-                                        this.replace.apply( this, Array.prototype.slice.call( arguments ) );
-
-                                return matchReplaceAll ?
-                                        this.replaceCounter : result;
+                                return result;
                         }
                 };
 
@@ -703 +698 @@
                                                                                 // Scope to full document.
                                                                                 finder.searchRange = getSearchRange( true );
                                                                                 finder.matchRange = null;
-                                                                                if ( ( replaceNums = finder.replace( dialog,
+                                                                                while( finder.replace( dialog,
                                                                                         dialog.getValueOf( 'replace', 'txtFindReplace' ),
                                                                                         dialog.getValueOf( 'replace', 'txtReplace' ),
                                                                                         dialog.getValueOf( 'replace', 'txtReplaceCaseChk' ),
                                                                                         dialog.getValueOf( 'replace', 'txtReplaceWordChk' ),
-                                                                                        false, true ) ) )
-                                                                                        alert( editor.lang.findAndReplace.replaceSuccessMsg.replace( /%1/, replaceNums ) );
+                                                                                        false ) )
+                                                                                ;
+
+                                                                                if ( finder.replaceCounter )
+                                                                                        alert( editor.lang.findAndReplace.replaceSuccessMsg.replace( /%1/, finder.replaceCounter ) );
                                                                                 else
                                                                                         alert( editor.lang.findAndReplace.notFoundMsg );
                                                                         }