diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-09-07 07:17:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 07:17:05 +0200 |
| commit | 061fca8c6eb1221788dd29c5494d63d6eadacd8f (patch) | |
| tree | 7cc2176a7c1ab35df50414e17b23e98f9f1b2e99 /app | |
| parent | f6d042f56d1f1269652e3ffee0722bbb6f842164 (diff) | |
| parent | e317a5ab607d902194a494c92743e8a8d27625f2 (diff) | |
| download | wallabag-061fca8c6eb1221788dd29c5494d63d6eadacd8f.tar.gz wallabag-061fca8c6eb1221788dd29c5494d63d6eadacd8f.tar.zst wallabag-061fca8c6eb1221788dd29c5494d63d6eadacd8f.zip | |
Merge pull request #3340 from Kdecherf/fix-webpack
Fix webpack error on comments
Diffstat (limited to 'app')
| -rw-r--r-- | app/Resources/static/themes/_global/index.js | 2 | ||||
| -rw-r--r-- | app/Resources/static/themes/_global/js/shortcuts/main.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Resources/static/themes/_global/index.js b/app/Resources/static/themes/_global/index.js index 3ec26488..fddb476d 100644 --- a/app/Resources/static/themes/_global/index.js +++ b/app/Resources/static/themes/_global/index.js | |||
| @@ -9,7 +9,7 @@ import 'material-design-icons-iconfont/dist/material-design-icons.css'; | |||
| 9 | import 'lato-font/css/lato-font.css'; | 9 | import 'lato-font/css/lato-font.css'; |
| 10 | import './global.scss'; | 10 | import './global.scss'; |
| 11 | 11 | ||
| 12 | /* Shortcuts*/ | 12 | /* Shortcuts */ |
| 13 | import './js/shortcuts/entry'; | 13 | import './js/shortcuts/entry'; |
| 14 | import './js/shortcuts/main'; | 14 | import './js/shortcuts/main'; |
| 15 | 15 | ||
diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index c81bf869..b99fa802 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | import Mousetrap from 'mousetrap'; | 1 | import Mousetrap from 'mousetrap'; |
| 2 | 2 | ||
| 3 | /** Shortcuts **/ | 3 | /* Shortcuts */ |
| 4 | 4 | ||
| 5 | /* Go to */ | 5 | /* Go to */ |
| 6 | Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); | 6 | Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); |