Explorar el Código

:rotating_light:

Liyuan Li hace 5 años
padre
commit
251f9b877e
Se han modificado 4 ficheros con 16 adiciones y 15 borrados
  1. 6 6
      src/ts/ir/highlightToolbar.ts
  2. 1 1
      src/ts/ir/input.ts
  3. 7 7
      src/ts/ir/process.ts
  4. 2 1
      src/ts/toolbar/EditMode.ts

+ 6 - 6
src/ts/ir/highlightToolbar.ts

@@ -18,28 +18,28 @@ export const highlightToolbar = (vditor: IVditor) => {
         enableToolbar(vditor.toolbar.elements, allToolbar);
 
         const range = getEditorRange(vditor.ir.element);
-        let typeElement = range.startContainer as HTMLElement
+        let typeElement = range.startContainer as HTMLElement;
         if (range.startContainer.nodeType === 3) {
             typeElement = range.startContainer.parentElement;
         }
         if (typeElement.classList.contains("vditor-reset")) {
-            typeElement = typeElement.childNodes[range.startOffset] as HTMLElement
+            typeElement = typeElement.childNodes[range.startOffset] as HTMLElement;
         }
 
-        const headingElement = hasClosestByTag(typeElement, "H")
+        const headingElement = hasClosestByTag(typeElement, "H");
         if (headingElement && headingElement.tagName.length === 2) {
             setCurrentToolbar(vditor.toolbar.elements, ["headings"]);
         }
 
-        const quoteElement = hasClosestByMatchTag(typeElement, "BLOCKQUOTE")
+        const quoteElement = hasClosestByMatchTag(typeElement, "BLOCKQUOTE");
         if (quoteElement) {
             setCurrentToolbar(vditor.toolbar.elements, ["quote"]);
         }
-        const aElement = hasClosestByAttribute(typeElement, "data-type", "a")
+        const aElement = hasClosestByAttribute(typeElement, "data-type", "a");
         if (aElement) {
             setCurrentToolbar(vditor.toolbar.elements, ["link"]);
         }
-        const emElement = hasClosestByAttribute(typeElement, "data-type", "em")
+        const emElement = hasClosestByAttribute(typeElement, "data-type", "em");
         if (emElement) {
             setCurrentToolbar(vditor.toolbar.elements, ["italic"]);
         }

+ 1 - 1
src/ts/ir/input.ts

@@ -50,7 +50,7 @@ export const input = (vditor: IVditor, range: Range) => {
         // 使用顶级块元素,应使用 innerHTML
         blockElement = vditor.ir.element;
     }
-    if (!blockElement.querySelector('wbr')) {
+    if (!blockElement.querySelector("wbr")) {
         // document.exeComment insertHTML 会插入 wbr
         range.insertNode(document.createElement("wbr"));
     }

+ 7 - 7
src/ts/ir/process.ts

@@ -106,9 +106,9 @@ export const processHeading = (vditor: IVditor, value: string) => {
 export const processToolbar = (vditor: IVditor, actionBtn: Element) => {
     const range = getEditorRange(vditor.ir.element);
     const commandName = actionBtn.getAttribute("data-type");
-    let typeElement = range.startContainer as HTMLElement
+    let typeElement = range.startContainer as HTMLElement;
     if (range.startContainer.nodeType !== 3 && typeElement.classList.contains("vditor-reset")) {
-        typeElement = typeElement.childNodes[range.startOffset] as HTMLElement
+        typeElement = typeElement.childNodes[range.startOffset] as HTMLElement;
     }
     // 移除
     if (actionBtn.classList.contains("vditor-menu--current")) {
@@ -122,12 +122,12 @@ export const processToolbar = (vditor: IVditor, actionBtn: Element) => {
         } else if (commandName === "link") {
             const aElement = hasClosestByAttribute(range.startContainer, "data-type", "a") as HTMLElement;
             if (aElement) {
-                const aTextElement = hasClosestByClassName(range.startContainer, "vditor-ir__link")
+                const aTextElement = hasClosestByClassName(range.startContainer, "vditor-ir__link");
                 if (aTextElement) {
                     range.insertNode(document.createElement("wbr"));
                     aElement.outerHTML = aTextElement.innerHTML;
                 } else {
-                    aElement.outerHTML = aElement.querySelector('.vditor-ir__link').innerHTML + "<wbr>"
+                    aElement.outerHTML = aElement.querySelector(".vditor-ir__link").innerHTML + "<wbr>";
                 }
             }
         }
@@ -148,13 +148,13 @@ export const processToolbar = (vditor: IVditor, actionBtn: Element) => {
             }
         } else if (commandName === "link") {
             if (range.toString() === "") {
-                document.execCommand("insertHTML", false, "[<wbr>]()")
+                document.execCommand("insertHTML", false, "[<wbr>]()");
             } else {
-                document.execCommand("insertHTML", false, `[${range.toString()}](<wbr>)`)
+                document.execCommand("insertHTML", false, `[${range.toString()}](<wbr>)`);
             }
         }
     }
     setRangeByWbr(vditor.ir.element, range);
     processAfterRender(vditor);
     highlightToolbar(vditor);
-}
+};

+ 2 - 1
src/ts/toolbar/EditMode.ts

@@ -27,7 +27,8 @@ export const setEditMode = (vditor: IVditor, type: string, event?: Event) => {
     enableToolbar(vditor.toolbar.elements, allToolbar);
     removeCurrentToolbar(vditor.toolbar.elements, allToolbar);
 
-    const irUnUsedToolbar = ["bold", "italic", "strike", "list", "ordered-list", "check", "code", "inline-code", "table"];
+    const irUnUsedToolbar = ["bold", "italic", "strike", "list", "ordered-list", "check", "code",
+        "inline-code", "table"];
     showToolbar(vditor.toolbar.elements, irUnUsedToolbar);
     if (type === "ir") {
         hideToolbar(vditor.toolbar.elements, ["format", "both", "preview"].concat(irUnUsedToolbar));