From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Thu, 7 Jun 2018 06:22:14 +0000 (+0000)
Subject: Merge pull request #3636 from flozz/syntax-highlight
X-Git-Tag: 2.3.3~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=36054f5dd42413ed5877db8c50fe9f1a3c6167c6;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3636 from flozz/syntax-highlight

Highlight code in articles using highlight.js
---

36054f5dd42413ed5877db8c50fe9f1a3c6167c6
diff --combined app/Resources/static/themes/_global/index.js
index b810e5d7,7f7e87c0..ae598e56
--- a/app/Resources/static/themes/_global/index.js
+++ b/app/Resources/static/themes/_global/index.js
@@@ -13,8 -13,10 +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 +67,7 @@@ $(document).ready(() => 
      retrievePercent(x.entryId);
  
      $(window).resize(() => {
 -      retrievePercent(x.entryId);
 +      retrievePercent(x.entryId, true);
      });
    }
  });