Merge pull request #2640 from wallabag/fix-openoriginal

Fixed entry shortcuts available in list view

2 files changed, 38 insertions, 30 deletions

diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
index 22aa0caf..c87408b9 100644
--- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
@@ -1,22 +1,26 @@
 import Mousetrap from 'mousetrap';
 import $ from 'jquery';
 
-/* Article view */
-Mousetrap.bind('o', () => {
-  $('div#article_toolbar ul.links a.original')[0].click();
-});
+$(document).ready(() => {
+  if ($('#article').length > 0) {
+    /* Article view */
+    Mousetrap.bind('o', () => {
+      $('div#article_toolbar ul.links a.original')[0].click();
+    });
 
-/* mark as favorite */
-Mousetrap.bind('f', () => {
-  $('div#article_toolbar ul.links a.favorite')[0].click();
-});
+    /* mark as favorite */
+    Mousetrap.bind('f', () => {
+      $('div#article_toolbar ul.links a.favorite')[0].click();
+    });
 
-/* mark as read */
-Mousetrap.bind('a', () => {
-  $('div#article_toolbar ul.links a.markasread')[0].click();
-});
+    /* mark as read */
+    Mousetrap.bind('a', () => {
+      $('div#article_toolbar ul.links a.markasread')[0].click();
+    });
 
-/* delete */
-Mousetrap.bind('del', () => {
-  $('div#article_toolbar ul.links a.delete')[0].click();
+    /* delete */
+    Mousetrap.bind('del', () => {
+      $('div#article_toolbar ul.links a.delete')[0].click();
+    });
+  }
 });
diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js
index 2dcc93d7..e19800bd 100644
--- a/app/Resources/static/themes/material/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/material/js/shortcuts/entry.js
@@ -1,22 +1,26 @@
 import Mousetrap from 'mousetrap';
 import $ from 'jquery';
 
-/* open original article */
-Mousetrap.bind('o', () => {
-  $('ul.side-nav a.original i')[0].click();
-});
+$(document).ready(() => {
+  if ($('#article').length > 0) {
+    /* open original article */
+    Mousetrap.bind('o', () => {
+      $('ul.side-nav a.original i')[0].click();
+    });
 
-/* mark as favorite */
-Mousetrap.bind('f', () => {
-  $('ul.side-nav a.favorite i')[0].click();
-});
+    /* mark as favorite */
+    Mousetrap.bind('f', () => {
+      $('ul.side-nav a.favorite i')[0].click();
+    });
 
-/* mark as read */
-Mousetrap.bind('a', () => {
-  $('ul.side-nav a.markasread i')[0].click();
-});
+    /* mark as read */
+    Mousetrap.bind('a', () => {
+      $('ul.side-nav a.markasread i')[0].click();
+    });
 
-/* delete */
-Mousetrap.bind('del', () => {
-  $('ul.side-nav a.delete i')[0].click();
+    /* delete */
+    Mousetrap.bind('del', () => {
+      $('ul.side-nav a.delete i')[0].click();
+    });
+  }
 });