From 06b59c7210e251efec8b159144745b135c237de8 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Thu, 18 Dec 2014 15:51:09 +0100 Subject: [PATCH 1/3] [fix] Show map on result in Oscar Allow to find the leafleet js when searx is not installed at the root of the web server. --- searx/static/oscar/js/searx.min.js | Bin 4515 -> 4516 bytes .../oscar/js/searx_src/00_requirejs_config.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/oscar/js/searx.min.js index 69cb816aec8237d2f748bcb096d67c3bd1e26b97..a60597b956d7031ba29adc7001d1b53f50037974 100644 GIT binary patch delta 12 TcmZ3iyhM3I8l&FEG+RLc9g74Q delta 10 RcmZ3YyjXcc+QxKSK>!z=1L^<( diff --git a/searx/static/oscar/js/searx_src/00_requirejs_config.js b/searx/static/oscar/js/searx_src/00_requirejs_config.js index 36767843b..99ec4b585 100644 --- a/searx/static/oscar/js/searx_src/00_requirejs_config.js +++ b/searx/static/oscar/js/searx_src/00_requirejs_config.js @@ -16,7 +16,7 @@ */ requirejs.config({ - baseUrl: '/static/oscar/js', + baseUrl: './static/oscar/js', paths: { app: '../app' } From 2ab621c0e30384a41a286cfb2bcb95225b10b1ef Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 19 Dec 2014 05:05:12 +0100 Subject: [PATCH 2/3] Some more path issues --- searx/static/oscar/js/searx.min.js | Bin 4516 -> 4517 bytes .../static/oscar/js/searx_src/leaflet_map.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/oscar/js/searx.min.js index a60597b956d7031ba29adc7001d1b53f50037974..0ddef2e615b2ae27b298101105add4a9b47810bc 100644 GIT binary patch delta 14 VcmZ3Yyi|EZE)S#L=3E|gRsbdh1W*6~ delta 12 TcmZ3gyhM3JF3;vX9&=UzAAJNO diff --git a/searx/static/oscar/js/searx_src/leaflet_map.js b/searx/static/oscar/js/searx_src/leaflet_map.js index 88af1e712..b5112ef5e 100644 --- a/searx/static/oscar/js/searx_src/leaflet_map.js +++ b/searx/static/oscar/js/searx_src/leaflet_map.js @@ -116,7 +116,7 @@ $(document).ready(function(){ // TODO hack // change default imagePath - L.Icon.Default.imagePath = "/static/oscar/img/map"; + L.Icon.Default.imagePath = "./static/oscar/img/map"; // init map var map = L.map(leaflet_target); From 2fe33234490c3e57d9b399815d6163d6aeac46cf Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 19 Dec 2014 06:11:46 +0100 Subject: [PATCH 3/3] Add double clic on categories Allow to double clic on any category to activate or deactivate all categories. --- searx/static/oscar/js/searx.min.js | Bin 4517 -> 5026 bytes .../oscar/js/searx_src/element_modifiers.js | 21 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/oscar/js/searx.min.js index 0ddef2e615b2ae27b298101105add4a9b47810bc..2fba710630d38cc0c3eaf502750699834ac52550 100644 GIT binary patch delta 426 zcmZ3gyhwe5B&(sNuA$LJxl1g9Iw~4UdPyaDy2ZIlntCZoIg>XqiBCSotiWhJ*_B11 zUIQVoV5g9oS5R64RF_y%Qlz1joRONGotmPg17~R>8Hc32peVlpNx7l{vO17)DJjl5 ziN(bliRcolFd3!9 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'); + } + }); });