diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2014-12-19 22:53:37 +0100 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2014-12-19 22:53:37 +0100 |
| commit | 667f4d5cfc4cb6bc0c2e47f230915d35e63bc3d2 (patch) | |
| tree | 7d12bea4e61f70edeb4dfadb0100cf48a42fbcd6 /searx/static/oscar/js/searx_src | |
| parent | f14177381433618a5b4f5bcff83e4e1a19487f02 (diff) | |
| parent | 2fe33234490c3e57d9b399815d6163d6aeac46cf (diff) | |
Merge pull request #156 from Cqoicebordel/Fix-map-oscar
[fix][enh] Multiple JS changes in Oscar
Diffstat (limited to 'searx/static/oscar/js/searx_src')
| -rw-r--r-- | searx/static/oscar/js/searx_src/00_requirejs_config.js | 2 | ||||
| -rw-r--r-- | searx/static/oscar/js/searx_src/element_modifiers.js | 21 | ||||
| -rw-r--r-- | searx/static/oscar/js/searx_src/leaflet_map.js | 2 |
3 files changed, 23 insertions, 2 deletions
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'
}
diff --git a/searx/static/oscar/js/searx_src/element_modifiers.js b/searx/static/oscar/js/searx_src/element_modifiers.js index 088bd7a46..dd45b77e0 100644 --- a/searx/static/oscar/js/searx_src/element_modifiers.js +++ b/searx/static/oscar/js/searx_src/element_modifiers.js @@ -63,4 +63,25 @@ $(document).ready(function(){ $(this).toggleClass(btnClass);
$(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');
+ }
+ });
});
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);
|