Merge pull request #2416 from wallabag/2.2

wallabag 2.2.0

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 @@
-const $ = require('jquery');
+import $ from 'jquery';
+import './shortcuts/main';
+import './shortcuts/entry';
+
+/* Allows inline call qr-code call */
+import jrQrcode from 'jr-qrcode'; // eslint-disable-line
 
 function supportsLocalStorage() {
   try {
@@ -30,7 +35,7 @@ function initFilters() {
   // no display if filters not available
   if ($('div').is('#filters')) {
     $('#button_filters').show();
-    $('.button-collapse-right').sideNav({ edge: 'right' });
+    $('.js-filters-action').sideNav({ edge: 'right' });
     $('#clear_form_filters').on('click', () => {
       $('#filters input').val('');
       $('#filters :checked').removeAttr('checked');
@@ -43,7 +48,7 @@ function initExport() {
   // no display if export not available
   if ($('div').is('#export')) {
     $('#button_export').show();
-    $('.button-collapse-right').sideNav({ edge: 'right' });
+    $('.js-export-action').sideNav({ edge: 'right' });
   }
 }