Browse Source

Merge pull request #156 from Cqoicebordel/Fix-map-oscar

[fix][enh] Multiple JS changes in Oscar
Adam Tauber 10 years ago
parent
commit
667f4d5cfc

File diff suppressed because it is too large
+ 0 - 1
searx/static/oscar/js/searx.min.js


+ 1 - 1
searx/static/oscar/js/searx_src/00_requirejs_config.js

@@ -16,7 +16,7 @@
  */
  */
 
 
 requirejs.config({
 requirejs.config({
-    baseUrl: '/static/oscar/js',
+    baseUrl: './static/oscar/js',
     paths: {
     paths: {
         app: '../app'
         app: '../app'
     }
     }

+ 21 - 0
searx/static/oscar/js/searx_src/element_modifiers.js

@@ -63,4 +63,25 @@ $(document).ready(function(){
         $(this).toggleClass(btnClass);
         $(this).toggleClass(btnClass);
         $(this).toggleClass('btn-default');
         $(this).toggleClass('btn-default');
     });
     });
+    
+    /**
+     * Select or deselect every categories on double clic
+     */
+    $(".btn-sm").dblclick(function() {
+    var btnClass = 'btn-' + $(this).data('btn-class'); // primary
+        if($(this).hasClass('btn-default')) {
+            $(".btn-sm > input").attr('checked', 'checked');
+            $(".btn-sm > input").prop("checked", true);
+            $(".btn-sm").addClass(btnClass);
+            $(".btn-sm").addClass('active');
+            $(".btn-sm").removeClass('btn-default');
+        } else {
+            $(".btn-sm > input").attr('checked', '');
+            $(".btn-sm > input").removeAttr('checked');
+            $(".btn-sm > input").checked = false;
+            $(".btn-sm").removeClass(btnClass);
+            $(".btn-sm").removeClass('active');
+            $(".btn-sm").addClass('btn-default');
+        }
+    });
 });
 });

+ 1 - 1
searx/static/oscar/js/searx_src/leaflet_map.js

@@ -116,7 +116,7 @@ $(document).ready(function(){
 
 
             // TODO hack
             // TODO hack
             // change default imagePath
             // change default imagePath
-            L.Icon.Default.imagePath = 	"/static/oscar/img/map";
+            L.Icon.Default.imagePath = 	"./static/oscar/img/map";
 
 
             // init map
             // init map
             var map = L.map(leaflet_target);
             var map = L.map(leaflet_target);

Some files were not shown because too many files changed in this diff