9 files changed, 71 insertions, 46 deletions

diff --git a/app/Resources/static/themes/_global/js/shortcuts/entry.js b/app/Resources/static/themes/_global/js/shortcuts/entry.js
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app/Resources/static/themes/_global/js/shortcuts/entry.js
diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js
new file mode 100644
index 00000000..0bb962d0
--- /dev/null
+++ b/app/Resources/static/themes/_global/js/shortcuts/main.js
@@ -0,0 +1,13 @@
+/** Shortcuts **/
+
+/* Go to */
+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('?', () => { window.location.href = Routing.generate('howto'); });
+Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); });
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js
index 96d9fcf6..77879dcd 100644
--- a/app/Resources/static/themes/_global/js/tools.js
+++ b/app/Resources/static/themes/_global/js/tools.js
@@ -1,5 +1,7 @@
 import $ from 'jquery';
 import Mousetrap from 'mousetrap';
+import './shortcuts/main.js';
+import './shortcuts/entry.js';
 
 /* Allows inline call qr-code call */
 import jrQrcode from 'jr-qrcode'; // eslint-disable-line
@@ -52,49 +54,3 @@ function initExport() {
 }
 
 export { savePercent, retrievePercent, initFilters, initExport };
-
-/** Shortcuts **/
-
-/* Go to */
-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', () => {
-  $('#nav-btn-add').trigger('click');
-});
-
-Mousetrap.bind('esc', () => {
-  $('.close').trigger('click');
-});
-
-// Display the first element of the current view
-Mousetrap.bind('right', () => {
-  $('ul.data li:first-child span.dot-ellipsis a')[0].click();
-});
-
-/* Article view */
-Mousetrap.bind('o', () => {
-  $('ul.side-nav li:nth-child(2) a i')[0].click();
-});
-
-Mousetrap.bind('s', () => {
-  $('ul.side-nav li:nth-child(5) a i')[0].click();
-});
-
-Mousetrap.bind('a', () => {
-  $('ul.side-nav li:nth-child(4) a i')[0].click();
-});
-
-Mousetrap.bind('del', () => {
-  $('ul.side-nav li:nth-child(6) a i')[0].click();
-});
diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js
index b7347f7c..5a8911ad 100755
--- a/app/Resources/static/themes/baggy/js/init.js
+++ b/app/Resources/static/themes/baggy/js/init.js
@@ -1,4 +1,7 @@
 import $ from 'jquery';
+import { initFilters, initExport } from '../../_global/js/tools';
+import './shortcuts/main.js';
+import './shortcuts/entry.js';
 
 /* eslint-disable no-unused-vars */
 /* jquery has default scope */
diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
new file mode 100644
index 00000000..d618f28e
--- /dev/null
+++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
@@ -0,0 +1,19 @@
+/* Article view */
+Mousetrap.bind('o', () => {
+    $('div#article_toolbar ul.links li:nth-child(2) a')[0].click();
+});
+
+/* mark as favorite */
+Mousetrap.bind('s', () => {
+    $('div#article_toolbar ul.links li:nth-child(5) a')[0].click();
+});
+
+/* mark as read */
+Mousetrap.bind('a', () => {
+    $('div#article_toolbar ul.links li:nth-child(4) a')[0].click();
+});
+
+/* delete */
+Mousetrap.bind('del', () => {
+    $('div#article_toolbar ul.links li:nth-child(7) a')[0].click();
+});
diff --git a/app/Resources/static/themes/baggy/js/shortcuts/main.js b/app/Resources/static/themes/baggy/js/shortcuts/main.js
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app/Resources/static/themes/baggy/js/shortcuts/main.js
diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
index d8edeed1..3ff8de0a 100755
--- a/app/Resources/static/themes/material/js/init.js
+++ b/app/Resources/static/themes/material/js/init.js
@@ -1,6 +1,8 @@
 import $ from 'jquery';
 import annotator from 'annotator';
 import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
+import './shortcuts/main.js';
+import './shortcuts/entry.js';
 
 require('materialize'); // eslint-disable-line
 
diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js
new file mode 100644
index 00000000..900a8214
--- /dev/null
+++ b/app/Resources/static/themes/material/js/shortcuts/entry.js
@@ -0,0 +1,19 @@
+/* open original article */
+Mousetrap.bind('o', () => {
+    $('ul.side-nav li:nth-child(2) a i')[0].click();
+});
+
+/* mark as favorite */
+Mousetrap.bind('s', () => {
+    $('ul.side-nav li:nth-child(5) a i')[0].click();
+});
+
+/* mark as read */
+Mousetrap.bind('a', () => {
+    $('ul.side-nav li:nth-child(4) a i')[0].click();
+});
+
+/* delete */
+Mousetrap.bind('del', () => {
+    $('ul.side-nav li:nth-child(6) a i')[0].click();
+});
diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js
new file mode 100644
index 00000000..ccd3c92d
--- /dev/null
+++ b/app/Resources/static/themes/material/js/shortcuts/main.js
@@ -0,0 +1,13 @@
+/* Actions */
+Mousetrap.bind('g n', () => {
+    $('#nav-btn-add').trigger('click');
+});
+
+Mousetrap.bind('esc', () => {
+    $('.close').trigger('click');
+});
+
+// Display the first element of the current view
+Mousetrap.bind('right', () => {
+    $('ul.data li:first-child span.dot-ellipsis a')[0].click();
+});