From af61cb80eb600618df95a01a15a08e87fc878c2a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 27 Oct 2016 01:57:27 +0200 Subject: es6 imports Signed-off-by: Thomas Citharel --- .../static/themes/_global/js/bookmarklet.js | 1 - app/Resources/static/themes/_global/js/tools.js | 52 +++++++++++----------- 2 files changed, 26 insertions(+), 27 deletions(-) (limited to 'app/Resources/static/themes/_global/js') diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js index 5174ff47..a497628b 100644 --- a/app/Resources/static/themes/_global/js/bookmarklet.js +++ b/app/Resources/static/themes/_global/js/bookmarklet.js @@ -1,4 +1,3 @@ - top['bookmarklet-url@wallabag.org'] = 'bag it!' + '' + diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index d6a2d803..96d9fcf6 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,5 @@ -const $ = require('jquery'); -require('mousetrap'); +import $ from 'jquery'; +import Mousetrap from 'mousetrap'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -56,45 +56,45 @@ export { savePercent, retrievePercent, initFilters, initExport }; /** Shortcuts **/ /* Go to */ -Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); -Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); -Mousetrap.bind('g r', function() { window.location.href = Routing.generate('archive') }); -Mousetrap.bind('g a', function() { window.location.href = Routing.generate('all') }); -Mousetrap.bind('g t', function() { window.location.href = Routing.generate('tag') }); -Mousetrap.bind('g c', function() { window.location.href = Routing.generate('config') }); -Mousetrap.bind('g i', function() { window.location.href = Routing.generate('import') }); -Mousetrap.bind('g d', function() { window.location.href = Routing.generate('developer') }); -Mousetrap.bind('g h', function() { window.location.href = Routing.generate('howto') }); -Mousetrap.bind('g l', function() { window.location.href = Routing.generate('logout') }); +Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); +Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); +Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); +Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); +Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); +Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); +Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); +Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); +Mousetrap.bind('g h', () => { window.location.href = Routing.generate('howto'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); /* Actions */ -Mousetrap.bind('g n', function() { - $("#nav-btn-add").trigger("click"); +Mousetrap.bind('g n', () => { + $('#nav-btn-add').trigger('click'); }); -Mousetrap.bind('esc', function() { - $(".close").trigger("click"); +Mousetrap.bind('esc', () => { + $('.close').trigger('click'); }); // Display the first element of the current view -Mousetrap.bind('right', function() { - $("ul.data li:first-child span.dot-ellipsis a")[0].click(); +Mousetrap.bind('right', () => { + $('ul.data li:first-child span.dot-ellipsis a')[0].click(); }); /* Article view */ -Mousetrap.bind('o', function() { - $("ul.side-nav li:nth-child(2) a i")[0].click(); +Mousetrap.bind('o', () => { + $('ul.side-nav li:nth-child(2) a i')[0].click(); }); -Mousetrap.bind('s', function() { - $("ul.side-nav li:nth-child(5) a i")[0].click(); +Mousetrap.bind('s', () => { + $('ul.side-nav li:nth-child(5) a i')[0].click(); }); -Mousetrap.bind('a', function() { - $("ul.side-nav li:nth-child(4) a i")[0].click(); +Mousetrap.bind('a', () => { + $('ul.side-nav li:nth-child(4) a i')[0].click(); }); -Mousetrap.bind('del', function() { - $("ul.side-nav li:nth-child(6) a i")[0].click(); +Mousetrap.bind('del', () => { + $('ul.side-nav li:nth-child(6) a i')[0].click(); }); -- cgit v1.2.3