diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /app/Resources/static/themes/_global/js/tools.js | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'app/Resources/static/themes/_global/js/tools.js')
-rw-r--r-- | app/Resources/static/themes/_global/js/tools.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index ab30deb1..cee84fa8 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js | |||
@@ -1,4 +1,9 @@ | |||
1 | const $ = require('jquery'); | 1 | import $ from 'jquery'; |
2 | import './shortcuts/main'; | ||
3 | import './shortcuts/entry'; | ||
4 | |||
5 | /* Allows inline call qr-code call */ | ||
6 | import jrQrcode from 'jr-qrcode'; // eslint-disable-line | ||
2 | 7 | ||
3 | function supportsLocalStorage() { | 8 | function supportsLocalStorage() { |
4 | try { | 9 | try { |
@@ -30,7 +35,7 @@ function initFilters() { | |||
30 | // no display if filters not available | 35 | // no display if filters not available |
31 | if ($('div').is('#filters')) { | 36 | if ($('div').is('#filters')) { |
32 | $('#button_filters').show(); | 37 | $('#button_filters').show(); |
33 | $('.button-collapse-right').sideNav({ edge: 'right' }); | 38 | $('.js-filters-action').sideNav({ edge: 'right' }); |
34 | $('#clear_form_filters').on('click', () => { | 39 | $('#clear_form_filters').on('click', () => { |
35 | $('#filters input').val(''); | 40 | $('#filters input').val(''); |
36 | $('#filters :checked').removeAttr('checked'); | 41 | $('#filters :checked').removeAttr('checked'); |
@@ -43,7 +48,7 @@ function initExport() { | |||
43 | // no display if export not available | 48 | // no display if export not available |
44 | if ($('div').is('#export')) { | 49 | if ($('div').is('#export')) { |
45 | $('#button_export').show(); | 50 | $('#button_export').show(); |
46 | $('.button-collapse-right').sideNav({ edge: 'right' }); | 51 | $('.js-export-action').sideNav({ edge: 'right' }); |
47 | } | 52 | } |
48 | } | 53 | } |
49 | 54 | ||