✨ b3log#959

iweisi · Sep 17, 2019 · 363cb8d · 363cb8d
1 parent 1162b1f
commit 363cb8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
@@ -101,22 +101,13 @@ var Util = {
     }
   },
   parseHljs: function () {
-    Util.addStyle('https://cdn.jsdelivr.net/npm/vditor/dist/js/highlight.js/styles/github.css', 'vditorHljsStyle')
-    if (!Label.luteAvailable) {
-      if (typeof hljs === 'undefined') {
-        $.ajax({
-          url: 'https://cdn.jsdelivr.net/npm/vditor/dist/js/highlight.js/highlight.pack.js',
-          dataType: 'script',
-          cache: true,
-          success: function () {
-            hljs.initHighlighting.called = false
-            hljs.initHighlighting()
-          },
-        })
-      } else {
-        hljs.initHighlighting.called = false
-        hljs.initHighlighting()
-      }
+    if ($('.vditor-reset pre > code').length === 0) {
+      return
+    }
+    if (Label.luteAvailable) {
+      Util.addStyle('https://cdn.jsdelivr.net/npm/vditor/dist/js/chroma/github.css', 'vditorHljsStyle')
+    } else {
+      Vditor.highlightRender(Label.hljsStyle, true, document)
     }
   },
   /**
@@ -657,9 +648,8 @@ var Util = {
           if (element.style.display === 'none') {
             return
           }
-          Util.parseHljs()
           Util.LazyLoadImage()
-        },
+        }
       },
       upload: {
         max: Label.fileMaxSize,

diff --git a/src/main/webapp/skins/classic/footer.ftl b/src/main/webapp/skins/classic/footer.ftl
@@ -56,7 +56,7 @@
 
 <script src="${staticServePath}/js/symbol-defs${miniPostfix}.js?${staticResourceVersion}"></script>
 <script src="${staticServePath}/js/lib/compress/libs.min.js?${staticResourceVersion}"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/index.min.js Vditor.mathRender(document.body)"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/index.min.js"></script>
 <script src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"></script>
 <script>
     var Label = {