diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-10-23 11:09:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 11:09:17 +0200 |
commit | 1953a872932a63792293b4aec087880265ba89f7 (patch) | |
tree | fd16599e737fcdaf193c933ef3ec4a4ee248b117 /app/Resources/static/themes/_global/js | |
parent | d83d25dadec2c38460a32d96f5d2903426fec9d3 (diff) | |
parent | 702f2d67d60ca963492b90dad74cb5f8dcc84e51 (diff) | |
download | wallabag-1953a872932a63792293b4aec087880265ba89f7.tar.gz wallabag-1953a872932a63792293b4aec087880265ba89f7.tar.zst wallabag-1953a872932a63792293b4aec087880265ba89f7.zip |
Merge pull request #3011 from wallabag/2.3
wallabag 2.3.0
Diffstat (limited to 'app/Resources/static/themes/_global/js')
-rw-r--r-- | app/Resources/static/themes/_global/js/shortcuts/main.js | 2 | ||||
-rw-r--r-- | app/Resources/static/themes/_global/js/tools.js | 23 |
2 files changed, 2 insertions, 23 deletions
diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index c81bf869..b99fa802 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js | |||
@@ -1,6 +1,6 @@ | |||
1 | import Mousetrap from 'mousetrap'; | 1 | import Mousetrap from 'mousetrap'; |
2 | 2 | ||
3 | /** Shortcuts **/ | 3 | /* Shortcuts */ |
4 | 4 | ||
5 | /* Go to */ | 5 | /* Go to */ |
6 | Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); | 6 | Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); |
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index cee84fa8..774f4539 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js | |||
@@ -31,25 +31,4 @@ function retrievePercent(id) { | |||
31 | return true; | 31 | return true; |
32 | } | 32 | } |
33 | 33 | ||
34 | function initFilters() { | 34 | export { savePercent, retrievePercent }; |
35 | // no display if filters not available | ||
36 | if ($('div').is('#filters')) { | ||
37 | $('#button_filters').show(); | ||
38 | $('.js-filters-action').sideNav({ edge: 'right' }); | ||
39 | $('#clear_form_filters').on('click', () => { | ||
40 | $('#filters input').val(''); | ||
41 | $('#filters :checked').removeAttr('checked'); | ||
42 | return false; | ||
43 | }); | ||
44 | } | ||
45 | } | ||
46 | |||
47 | function initExport() { | ||
48 | // no display if export not available | ||
49 | if ($('div').is('#export')) { | ||
50 | $('#button_export').show(); | ||
51 | $('.js-export-action').sideNav({ edge: 'right' }); | ||
52 | } | ||
53 | } | ||
54 | |||
55 | export { savePercent, retrievePercent, initFilters, initExport }; | ||