🚨

stevapple · Apr 8, 2020 · 9b49f7c · 9b49f7c
1 parent 5d973a0
commit 9b49f7c
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/src/ts/hint/index.ts b/src/ts/hint/index.ts
@@ -1,13 +1,13 @@
 import {Constants} from "../constants";
 import {processAfterRender} from "../ir/process";
+import {processCodeRender as processIRCodeRender} from "../ir/process";
 import {formatRender} from "../sv/formatRender";
 import {code160to32} from "../util/code160to32";
 import {getMarkdown} from "../util/getMarkdown";
 import {hasClosestByAttribute, hasClosestByClassName} from "../util/hasClosest";
 import {getCursorPosition, getSelectPosition, insertHTML, setSelectionFocus} from "../util/selection";
 import {afterRenderEvent} from "../wysiwyg/afterRenderEvent";
 import {processCodeRender} from "../wysiwyg/processCodeRender";
-import {processCodeRender as processIRCodeRender} from "../ir/process";
 
 export class Hint {
     public timeId: number;
@@ -148,10 +148,10 @@ ${i === 0 ? "class='vditor-hint--current'" : ""}> ${html}</button>`;
                     range.selectNodeContents(preBeforeElement);
                     range.collapse(false);
                     processAfterRender(vditor);
-                    preBeforeElement.parentElement.querySelectorAll('code').forEach(item => {
-                        item.className = 'language-' + value.trimRight();
-                    })
-                    processIRCodeRender(preBeforeElement.parentElement.querySelector('.vditor-ir__preview'), vditor)
+                    preBeforeElement.parentElement.querySelectorAll("code").forEach((item) => {
+                        item.className = "language-" + value.trimRight();
+                    });
+                    processIRCodeRender(preBeforeElement.parentElement.querySelector(".vditor-ir__preview"), vditor);
                     return;
                 }
             }

diff --git a/src/ts/ir/index.ts b/src/ts/ir/index.ts
@@ -79,9 +79,10 @@ class IR {
                     + textPlain + codeElement.textContent.substring(position.end);
                 setSelectionByPosition(position.start + textPlain.length, position.start + textPlain.length,
                     codeElement.parentElement);
-                const previewElement = codeElement.parentElement.parentElement.querySelector('.vditor-ir__preview') as HTMLElement
-                previewElement.innerHTML = codeElement.outerHTML
-                processCodeRender(previewElement, vditor)
+                const previewElement =
+                    codeElement.parentElement.parentElement.querySelector(".vditor-ir__preview") as HTMLElement;
+                previewElement.innerHTML = codeElement.outerHTML;
+                processCodeRender(previewElement, vditor);
             } else if (code) {
                 document.execCommand("insertHTML", false, code);
             } else {

diff --git a/src/ts/ir/process.ts b/src/ts/ir/process.ts
@@ -1,14 +1,14 @@
 import {Constants} from "../constants";
-import {isSafari} from "../util/compatibility";
-import {getMarkdown} from "../util/getMarkdown";
-import {hasClosestByAttribute} from "../util/hasClosest";
-import {getEditorRange} from "../util/selection";
 import {abcRender} from "../markdown/abcRender";
-import {mermaidRender} from "../markdown/mermaidRender";
 import {chartRender} from "../markdown/chartRender";
+import {codeRender} from "../markdown/codeRender";
 import {graphvizRender} from "../markdown/graphvizRender";
 import {highlightRender} from "../markdown/highlightRender";
-import {codeRender} from "../markdown/codeRender";
+import {mermaidRender} from "../markdown/mermaidRender";
+import {isSafari} from "../util/compatibility";
+import {getMarkdown} from "../util/getMarkdown";
+import {hasClosestByAttribute} from "../util/hasClosest";
+import {getEditorRange} from "../util/selection";
 
 export const processAfterRender = (vditor: IVditor, options = {
     enableAddUndoStack: true,
@@ -64,7 +64,7 @@ export const processAfterRender = (vditor: IVditor, options = {
 };
 
 export const processCodeRender = (previewPanel: HTMLElement, vditor: IVditor) => {
-    const language = previewPanel.querySelector('code').className.replace('language-', '');
+    const language = previewPanel.querySelector("code").className.replace("language-", "");
     if (language === "abc") {
         previewPanel.style.marginTop = "1em";
         abcRender(previewPanel, vditor.options.cdn);
@@ -80,4 +80,4 @@ export const processCodeRender = (previewPanel: HTMLElement, vditor: IVditor) =>
             previewPanel, vditor.options.cdn);
         codeRender(previewPanel, vditor.options.lang);
     }
-}
+};
diff --git a/src/ts/ir/processKeydown.ts b/src/ts/ir/processKeydown.ts
@@ -103,7 +103,7 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
         if (!preBeforeElement.parentElement.previousElementSibling && (event.key === "ArrowUp" || event.key === "ArrowLeft")
             && getSelectPosition(preBeforeElement, range).start < 2) {
             preBeforeElement.parentElement.insertAdjacentHTML("beforebegin",
-                `<p data-block="0">${Constants.ZWSP}<wbr></p>`)
+                `<p data-block="0">${Constants.ZWSP}<wbr></p>`);
             setRangeByWbr(vditor.ir.element, range);
             event.preventDefault();
             return true;
@@ -113,7 +113,7 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
     if (preAfterElement) {
         if (event.key === "Enter") {
             preAfterElement.parentElement.insertAdjacentHTML("afterend",
-                `<p data-block="0">${Constants.ZWSP}<wbr></p>`)
+                `<p data-block="0">${Constants.ZWSP}<wbr></p>`);
             setRangeByWbr(vditor.ir.element, range);
             event.preventDefault();
             return true;

diff --git a/src/ts/markdown/md2html.ts b/src/ts/markdown/md2html.ts
@@ -2,15 +2,15 @@ import {VDITOR_VERSION} from "../constants";
 import {addScript} from "../util/addScript";
 
 export const loadLuteJs = (vditor: IVditor | string) => {
-    let cdn = `https://cdn.jsdelivr.net/npm/vditor@${VDITOR_VERSION}`;
-    if (typeof vditor === "string" && vditor) {
-        cdn = vditor;
-    } else if (typeof vditor === "object" && vditor.options.cdn) {
-        cdn = vditor.options.cdn;
-    }
-    addScript(`${cdn}/dist/js/lute/lute.min.js`, "vditorLuteScript");
+    // let cdn = `https://cdn.jsdelivr.net/npm/vditor@${VDITOR_VERSION}`;
+    // if (typeof vditor === "string" && vditor) {
+    //     cdn = vditor;
+    // } else if (typeof vditor === "object" && vditor.options.cdn) {
+    //     cdn = vditor.options.cdn;
+    // }
+    // addScript(`${cdn}/dist/js/lute/lute.min.js`, "vditorLuteScript");
     // addScript(`/src/js/lute/lute.min.js`, "vditorLuteScript");
-    // addScript(`http://192.168.2.248:9090/lute.min.js?${new Date().getTime()}`, "vditorLuteScript");
+    addScript(`http://192.168.2.248:9090/lute.min.js?${new Date().getTime()}`, "vditorLuteScript");
 
     if (vditor && typeof vditor === "object" && !vditor.lute) {
         vditor.lute = Lute.New();

diff --git a/src/ts/util/processPasteCode.ts b/src/ts/util/processPasteCode.ts
@@ -26,8 +26,8 @@ export const processPasteCode = (html: string, text: string, type = "sv") => {
                 return `<div class="vditor-wysiwyg__block" data-block="0" data-type="code-block"><pre><code>${
                     code.replace(/&/g, "&amp;").replace(/</g, "&lt;")}<wbr></code></pre></div>`;
             }
-            if (type === 'ir') {
-                return "```\n" + code.replace(/&/g, "&amp;").replace(/</g, "&lt;") + "\n```"
+            if (type === "ir") {
+                return "```\n" + code.replace(/&/g, "&amp;").replace(/</g, "&lt;") + "\n```";
             }
             return "```\n" + code + "\n```";
         } else {