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

3 files changed, 16 insertions, 4 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';
 import './js/shortcuts/entry';
 import './js/shortcuts/main';
 
-import { savePercent, retrievePercent } from './js/tools';
+/* Hightlight */
+import './js/highlight';
 
+import { savePercent, retrievePercent } from './js/tools';
 
 /* ==========================================================================
  Annotations & Remember position
@@ -65,7 +67,7 @@ $(document).ready(() => {
     retrievePercent(x.entryId);
 
     $(window).resize(() => {
-      retrievePercent(x.entryId);
+      retrievePercent(x.entryId, true);
     });
   }
 });
diff --git a/app/Resources/static/themes/_global/js/highlight.js b/app/Resources/static/themes/_global/js/highlight.js
new file mode 100644
index 00000000..4025fc14
--- /dev/null
+++ b/app/Resources/static/themes/_global/js/highlight.js
@@ -0,0 +1,8 @@
+import 'highlight.js/styles/atom-one-light.css';
+import * as hljs from 'highlight.js';
+
+window.addEventListener('load', () => {
+  document.querySelectorAll('pre').forEach((node) => {
+    hljs.highlightBlock(node);
+  });
+});
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js
index 774f4539..7e5a2b27 100644
--- a/app/Resources/static/themes/_global/js/tools.js
+++ b/app/Resources/static/themes/_global/js/tools.js
@@ -19,14 +19,16 @@ function savePercent(id, percent) {
   return true;
 }
 
-function retrievePercent(id) {
+function retrievePercent(id, resized) {
   if (!supportsLocalStorage()) { return false; }
 
   const bheight = $(document).height();
   const percent = localStorage[`wallabag.article.${id}.percent`];
   const scroll = bheight * percent;
 
-  $('html,body').animate({ scrollTop: scroll }, 'fast');
+  if (!resized) {
+    $('html,body').animate({ scrollTop: scroll }, 'fast');
+  }
 
   return true;
 }