Merge pull request #2640 from wallabag/fix-openoriginal

Fixed entry shortcuts available in list view

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();
+    });
+  }
 });

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();
+    });
+  }
 });

src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig

@@ -90,7 +90,7 @@
                         </a>
                     </li>
                     <li>
-                        <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search">
+                        <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search">
                             <i class="material-icons">search</i>
                         </a>
                     </li>