Merge remote-tracking branch 'origin/master'

[redakcja.git] / redakcja / static / js / wiki / view_search.js

diff --git a/redakcja/static/js/wiki/view_search.js b/redakcja/static/js/wiki/view_search.js
index 740c913..b49671c 100644 (file)
--- a/redakcja/static/js/wiki/view_search.js
+++ b/redakcja/static/js/wiki/view_search.js
@@ -7,6 +7,7 @@
         var old_callback = options.callback || function() { };
 
         this.noupdate_hash_onenter = true;
         var old_callback = options.callback || function() { };
 
         this.noupdate_hash_onenter = true;

+        this.vsplitbar = 'ZNAJDŹ I ZAMIEŃ';

 
         options.callback = function(){
             var self = this;
 
         options.callback = function(){
             var self = this;


@@ -89,7 +90,9 @@
         else {}
         self.searchCursor.select();
         self.searchCursor.replace(query);
         else {}
         self.searchCursor.select();
         self.searchCursor.replace(query);

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

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


@@ -99,6 +102,8 @@
         self.$searchCursor = null;
 
         $('.vsplitbar').not('.active').trigger('click');
         self.$searchCursor = null;
 
         $('.vsplitbar').not('.active').trigger('click');

+        $(".vsplitbar-title").html("↓ ZNAJDŹ I ZAMIEŃ ↓");        
+        

         if ($.wiki.activePerspective() != 'CodeMirrorPerspective')
             $.wiki.switchToTab('#CodeMirrorPerspective');
     };
         if ($.wiki.activePerspective() != 'CodeMirrorPerspective')
             $.wiki.switchToTab('#CodeMirrorPerspective');
     };


@@ -109,4 +114,4 @@
 
     $.wiki.SearchPerspective = SearchPerspective;
 
 
     $.wiki.SearchPerspective = SearchPerspective;
 

-})(jQuery);
\ No newline at end of file
+})(jQuery);