diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-05-09 11:43:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 11:43:48 +0200 |
commit | b28c5430efefa63d04d87404c99798e82d0427e4 (patch) | |
tree | 0bf158fb56120be6624fa26639a28beb84a6598e /app/Resources/static/themes/material/js/shortcuts | |
parent | 43f81a62e93fb20c7af619a5132276706e989c62 (diff) | |
parent | efac66cb56d650b863b64c9c4582589da6a2442a (diff) | |
download | wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.tar.gz wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.tar.zst wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.zip |
Merge pull request #3022 from wallabag/webpack
Adds Webpack support and remove Grunt
Diffstat (limited to 'app/Resources/static/themes/material/js/shortcuts')
-rw-r--r-- | app/Resources/static/themes/material/js/shortcuts/main.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js index 41499478..042b423c 100644 --- a/app/Resources/static/themes/material/js/shortcuts/main.js +++ b/app/Resources/static/themes/material/js/shortcuts/main.js | |||
@@ -28,6 +28,11 @@ $(document).ready(() => { | |||
28 | return; | 28 | return; |
29 | } | 29 | } |
30 | 30 | ||
31 | /* Show nothing on login/register page */ | ||
32 | if ($('#username').length > 0 || $('#fos_user_registration_form_username').length > 0) { | ||
33 | return; | ||
34 | } | ||
35 | |||
31 | /* Focus current card */ | 36 | /* Focus current card */ |
32 | toggleFocus(card); | 37 | toggleFocus(card); |
33 | 38 | ||