Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / app / Resources / static / themes / material / js / shortcuts / main.js

diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js
index 8514f71e2b64d089e9ca9171dcaf2e3dcdd17d88..042b423c0e129cc23e7138d2e530fd5c94104882 100644 (file)
--- a/app/Resources/static/themes/material/js/shortcuts/main.js
+++ b/app/Resources/static/themes/material/js/shortcuts/main.js
@@ -8,9 +8,14 @@ function toggleFocus(cardToToogleFocus) {
 }
 
 $(document).ready(() => {
+  const cards = $('#content').find('.card');
+  const cardNumber = cards.length;
   let cardIndex = 0;
-  const cardNumber = $('#content ul.data > li').length;
-  let card = $('#content ul.data > li')[cardIndex];
+  /* If we come from next page */
+  if (window.location.hash === '#prev') {
+    cardIndex = cardNumber - 1;
+  }
+  let card = cards[cardIndex];
   const pagination = $('.pagination');
 
   /* Show nothing on quickstart */
@@ -18,10 +23,14 @@ $(document).ready(() => {
     return;
   }
 
-  /* If we come from next page */
-  if (window.location.hash === '#prev') {
-    cardIndex = cardNumber - 1;
-    card = $('ul.data > li')[cardIndex];
+  /* Show nothing on login/register page */
+  if ($('#username').length > 0 || $('#fos_user_registration_form_username').length > 0) {
+    return;
+  }
+
+  /* Show nothing on login/register page */
+  if ($('#username').length > 0 || $('#fos_user_registration_form_username').length > 0) {
+    return;
   }
 
   /* Focus current card */
@@ -30,6 +39,12 @@ $(document).ready(() => {
   /* Actions */
   Mousetrap.bind('g n', () => {
     $('#nav-btn-add').trigger('click');
+    return false;
+  });
+
+  Mousetrap.bind('s', () => {
+    $('#nav-btn-search').trigger('click');
+    return false;
   });
 
   Mousetrap.bind('esc', () => {
@@ -41,7 +56,7 @@ $(document).ready(() => {
     if (cardIndex >= 0 && cardIndex < cardNumber - 1) {
       toggleFocus(card);
       cardIndex += 1;
-      card = $('ul.data > li')[cardIndex];
+      card = cards[cardIndex];
       toggleFocus(card);
       return;
     }
@@ -55,7 +70,7 @@ $(document).ready(() => {
     if (cardIndex > 0 && cardIndex < cardNumber) {
       toggleFocus(card);
       cardIndex -= 1;
-      card = $('ul.data > li')[cardIndex];
+      card = cards[cardIndex];
       toggleFocus(card);
       return;
     }