Adding "replace all" functionality to replace find & replace tool

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po
index 1dd02fc..a679724 100644 (file)
--- a/apps/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po
@@ -199,7 +199,10 @@ msgstr "Zamień na"
 msgid "Replace"
 msgstr "Zamień"
 
 msgid "Replace"
 msgstr "Zamień"
 

-#: templates/wiki/tabs/search_view.html:13
+#: templates/wiki/tabs/search_view.html:12
+msgid "Replace all"
+msgstr "Zamień wszystko"
+

 msgid "Options"
 msgstr "Opcje"
 
 msgid "Options"
 msgstr "Opcje"
 

diff --git a/apps/wiki/templates/wiki/tabs/search_view.html b/apps/wiki/templates/wiki/tabs/search_view.html
index 4bf1e89..2ed15ec 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/search_view.html
+++ b/apps/wiki/templates/wiki/tabs/search_view.html
@@ -8,6 +8,8 @@
     <p>{% trans "Replace with" %}:<br/>
         <input id='replace-input' /><br/>
         <button id='replace-button'>{% trans "Replace" %}</button><br/>
     <p>{% trans "Replace with" %}:<br/>
         <input id='replace-input' /><br/>
         <button id='replace-button'>{% trans "Replace" %}</button><br/>

+        <input type="checkbox" id="replace-all" />
+            <label for="replace-all">{% trans "Replace all" %}</label><br/>

     </p>
 
     <p>{% trans "Options" %}<br/>
     </p>
 
     <p>{% trans "Options" %}<br/>

diff --git a/redakcja/static/js/wiki/view_search.js b/redakcja/static/js/wiki/view_search.js
index 64a35c4..e41f19d 100644 (file)
--- a/redakcja/static/js/wiki/view_search.js
+++ b/redakcja/static/js/wiki/view_search.js
@@ -90,7 +90,10 @@
         else {}
         self.searchCursor.select();
         self.searchCursor.replace(query);
         else {}
         self.searchCursor.select();
         self.searchCursor.replace(query);

-        self.search();
+        if(self.options['replace-all']) {
+            while(self.search())
+                self.replace();
+        }

     };
 
     SearchPerspective.prototype.onEnter = function(success, failure){
     };
 
     SearchPerspective.prototype.onEnter = function(success, failure){