Fixes #4191: backward search.

diff --git a/src/redakcja/static/js/wiki/view_search.js b/src/redakcja/static/js/wiki/view_search.js
index e8f9e1b..09f64da 100644 (file)
--- a/src/redakcja/static/js/wiki/view_search.js
+++ b/src/redakcja/static/js/wiki/view_search.js
@@ -16,6 +16,7 @@
             this.$searchInput = $('#search-input', this.$element);
             this.$replaceInput = $('#replace-input', this.$element);
             this.$searchButton = $('#search-button', this.$element);
             this.$searchInput = $('#search-input', this.$element);
             this.$replaceInput = $('#replace-input', this.$element);
             this.$searchButton = $('#search-button', this.$element);

+            this.$searchPrevButton = $('#search-prev-button', this.$element);

             this.$replaceButton = $('#replace-button', this.$element);
 
             this.$replaceButton.attr("disabled","disabled");
             this.$replaceButton = $('#replace-button', this.$element);
 
             this.$replaceButton.attr("disabled","disabled");


@@ -41,6 +42,11 @@
                     alert('Brak wyników.');
             });
 
                     alert('Brak wyników.');
             });
 

+            this.$searchPrevButton.click(function(){
+                if (!self.search(false))
+                    alert('Brak wyników.');
+            });
+

             this.$replaceButton.click(function(){
                 self.replace();
             });
             this.$replaceButton.click(function(){
                 self.replace();
             });


@@ -53,7 +59,7 @@
 
     SearchPerspective.prototype = new $.wiki.SidebarPerspective();
 
 
     SearchPerspective.prototype = new $.wiki.SidebarPerspective();
 

-    SearchPerspective.prototype.search = function(){
+    SearchPerspective.prototype.search = function(forward=true){

         var self = this;
         var query = self.$searchInput.val();
 
         var self = this;
         var query = self.$searchInput.val();
 


@@ -73,7 +79,7 @@
                 options
             );
         }
                 options
             );
         }

-        if (self.searchCursor.findNext()) {
+        if (forward ? self.searchCursor.findNext() : self.searchCursor.findPrevious()) {

             self.editor.setSelection(self.searchCursor.from(), self.searchCursor.to());
             self.editor.scrollIntoView({from: self.searchCursor.from(), to: self.searchCursor.to()}, 20);
             self.$replaceButton.removeAttr("disabled");
             self.editor.setSelection(self.searchCursor.from(), self.searchCursor.to());
             self.editor.scrollIntoView({from: self.searchCursor.from(), to: self.searchCursor.to()}, 20);
             self.$replaceButton.removeAttr("disabled");

diff --git a/src/wiki/templates/wiki/tabs/search_view.html b/src/wiki/templates/wiki/tabs/search_view.html
index e54b879..23067b5 100644 (file)
--- a/src/wiki/templates/wiki/tabs/search_view.html
+++ b/src/wiki/templates/wiki/tabs/search_view.html
@@ -6,6 +6,7 @@
   </div>
   <div class="form-group">
     <button id='search-button' class="btn btn-primary">{% trans "Search" %}</button>
   </div>
   <div class="form-group">
     <button id='search-button' class="btn btn-primary">{% trans "Search" %}</button>

+    <button id='search-prev-button' class="btn btn-primary">&#8592;</button>

   </div>
   <div class="form-group">
     <label for="replace-input">{% trans "Replace with" %}:</label>
   </div>
   <div class="form-group">
     <label for="replace-input">{% trans "Replace with" %}:</label>