diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
commit | 44043ebe82a22470e2514d05efac324035ee809a (patch) | |
tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 /app/Resources/static/themes/_global/index.js | |
parent | 11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff) | |
parent | e586d65b64089fc1cc230a18c470aae3f45f91a6 (diff) | |
download | wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/Resources/static/themes/_global/index.js')
-rw-r--r-- | app/Resources/static/themes/_global/index.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/Resources/static/themes/_global/index.js b/app/Resources/static/themes/_global/index.js index fddb476d..ae598e56 100644 --- a/app/Resources/static/themes/_global/index.js +++ b/app/Resources/static/themes/_global/index.js | |||
@@ -13,8 +13,10 @@ import './global.scss'; | |||
13 | import './js/shortcuts/entry'; | 13 | import './js/shortcuts/entry'; |
14 | import './js/shortcuts/main'; | 14 | import './js/shortcuts/main'; |
15 | 15 | ||
16 | import { savePercent, retrievePercent } from './js/tools'; | 16 | /* Hightlight */ |
17 | import './js/highlight'; | ||
17 | 18 | ||
19 | import { savePercent, retrievePercent } from './js/tools'; | ||
18 | 20 | ||
19 | /* ========================================================================== | 21 | /* ========================================================================== |
20 | Annotations & Remember position | 22 | Annotations & Remember position |
@@ -65,7 +67,7 @@ $(document).ready(() => { | |||
65 | retrievePercent(x.entryId); | 67 | retrievePercent(x.entryId); |
66 | 68 | ||
67 | $(window).resize(() => { | 69 | $(window).resize(() => { |
68 | retrievePercent(x.entryId); | 70 | retrievePercent(x.entryId, true); |
69 | }); | 71 | }); |
70 | } | 72 | } |
71 | }); | 73 | }); |