From: Jérémy Benoist Date: Thu, 7 Sep 2017 05:17:05 +0000 (+0200) Subject: Merge pull request #3340 from Kdecherf/fix-webpack X-Git-Tag: 2.3.0~31^2~12 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=061fca8c6eb1221788dd29c5494d63d6eadacd8f;hp=f6d042f56d1f1269652e3ffee0722bbb6f842164;p=github%2Fwallabag%2Fwallabag.git Merge pull request #3340 from Kdecherf/fix-webpack Fix webpack error on comments --- 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'; import 'lato-font/css/lato-font.css'; import './global.scss'; -/* Shortcuts*/ +/* Shortcuts */ import './js/shortcuts/entry'; import './js/shortcuts/main'; 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 @@ import Mousetrap from 'mousetrap'; -/** Shortcuts **/ +/* Shortcuts */ /* Go to */ Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); });