🐛 fix #313

Vanessa219 · Apr 15, 2020 · e8ff29c · e8ff29c
1 parent 062e069
commit e8ff29c
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,6 +59,8 @@
 
 ### v3.1.11 / 2020-04-1x
 
+* [313](https://github.com/Vanessa219/vditor/issues/313) html 页面 点击禁用button 引起回调 `修复缺陷`
+
 ### v3.1.10 / 2020-04-15
 
 * [311](https://github.com/Vanessa219/vditor/issues/311) preview demo `改进功能`

diff --git a/src/ts/toolbar/Both.ts b/src/ts/toolbar/Both.ts
@@ -16,6 +16,7 @@ export class Both extends MenuItem {
 
     public _bindEvent(vditor: IVditor) {
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (vditor.currentMode !== "sv") {
                 return;
             }
@@ -24,7 +25,6 @@ export class Both extends MenuItem {
             } else {
                 setPreviewMode("both", vditor);
             }
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Custom.ts b/src/ts/toolbar/Custom.ts
@@ -6,8 +6,8 @@ export class Custom extends MenuItem {
         super(vditor, menuItem);
         this.element.children[0].innerHTML = menuItem.icon;
         this.element.children[0].addEventListener(getEventName(), (event) => {
-            menuItem.click();
             event.preventDefault();
+            menuItem.click();
         });
     }
 }
diff --git a/src/ts/toolbar/EditMode.ts b/src/ts/toolbar/EditMode.ts
@@ -148,6 +148,7 @@ export class EditMode extends MenuItem {
 
     public _bindEvent(vditor: IVditor) {
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
@@ -159,7 +160,6 @@ export class EditMode extends MenuItem {
                 this.panelElement.style.display = "block";
             }
             hidePanel(vditor, ["hint", "headings", "emoji"]);
-            event.preventDefault();
         });
 
         this.panelElement.children.item(0).addEventListener(getEventName(), (event: Event) => {

diff --git a/src/ts/toolbar/Emoji.ts b/src/ts/toolbar/Emoji.ts
@@ -44,6 +44,7 @@ data-value=":${key}: " data-key=":${key}:" class="vditor-emojis__icon" src="${em
 
     public _bindEvent(vditor: IVditor) {
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
@@ -54,7 +55,6 @@ data-value=":${key}: " data-key=":${key}:" class="vditor-emojis__icon" src="${em
                 this.panelElement.style.display = "block";
             }
             hidePanel(vditor, ["hint", "headings", "edit-mode"]);
-            event.preventDefault();
         });
 
         this.panelElement.querySelectorAll(".vditor-emojis button").forEach((element) => {

diff --git a/src/ts/toolbar/Format.ts b/src/ts/toolbar/Format.ts
@@ -10,9 +10,9 @@ export class Format extends MenuItem {
         super(vditor, menuItem);
         this.element.children[0].innerHTML = menuItem.icon || formatSVG;
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             formatRender(vditor,  vditor.lute.FormatMd( getMarkdown(vditor)),
                 getSelectPosition(vditor.sv.element, getSelection().getRangeAt(0)));
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Headings.ts b/src/ts/toolbar/Headings.ts
@@ -32,6 +32,7 @@ export class Headings extends MenuItem {
 
     public _bindEvent(vditor: IVditor) {
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
@@ -50,11 +51,11 @@ export class Headings extends MenuItem {
                 }
             }
             hidePanel(vditor, ["hint", "emoji", "edit-mode"]);
-            event.preventDefault();
         });
 
         for (let i = 0; i < 6; i++) {
             this.panelElement.children.item(i).addEventListener(getEventName(), (event: Event) => {
+                event.preventDefault();
                 if (vditor.currentMode === "wysiwyg") {
                     setHeading(vditor, (event.target as HTMLElement).getAttribute("data-tag"));
                     afterRenderEvent(vditor);
@@ -65,7 +66,6 @@ export class Headings extends MenuItem {
                         false, true);
                 }
                 this.panelElement.style.display = "none";
-                event.preventDefault();
             });
         }
     }

diff --git a/src/ts/toolbar/Indent.ts b/src/ts/toolbar/Indent.ts
@@ -12,6 +12,7 @@ export class Indent extends MenuItem {
         this.element.children[0].innerHTML = menuItem.icon || indentSVG;
 
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED) ||
                 vditor.currentMode === "sv") {
                 return;
@@ -21,7 +22,6 @@ export class Indent extends MenuItem {
             if (liElement) {
                 listIndent(vditor, liElement, range);
             }
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/MenuItem.ts b/src/ts/toolbar/MenuItem.ts
@@ -29,6 +29,7 @@ export class MenuItem {
 
     public bindEvent(vditor: IVditor, replace: boolean = false) {
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
@@ -41,7 +42,6 @@ export class MenuItem {
                 insertText(vditor, this.menuItem.prefix || "", this.menuItem.suffix || "",
                     replace, true);
             }
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Outdent.ts b/src/ts/toolbar/Outdent.ts
@@ -11,6 +11,7 @@ export class Outdent extends MenuItem {
         super(vditor, menuItem);
         this.element.children[0].innerHTML = menuItem.icon || outdentSVG;
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED) ||
                 vditor.currentMode === "sv") {
                 return;
@@ -20,7 +21,6 @@ export class Outdent extends MenuItem {
             if (liElement) {
                 listOutdent(vditor, liElement, range, liElement.parentElement);
             }
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Outline.ts b/src/ts/toolbar/Outline.ts
@@ -10,6 +10,7 @@ export class Outline extends MenuItem {
         super(vditor, menuItem);
         this.element.children[0].innerHTML = menuItem.icon || alignCenterSVG;
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             const btnElement = this.element.firstElementChild;
             if (btnElement.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
@@ -28,7 +29,6 @@ export class Outline extends MenuItem {
             vditor[vditor.currentMode].element.parentElement.style.overflow = "auto";
             setPadding(vditor);
             vditor[vditor.currentMode].element.parentElement.style.overflow = "visible";
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Preview.ts b/src/ts/toolbar/Preview.ts
@@ -16,6 +16,7 @@ export class Preview extends MenuItem {
 
     public _bindEvent(vditor: IVditor) {
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (vditor.currentMode === "wysiwyg") {
                 return;
             }
@@ -24,7 +25,6 @@ export class Preview extends MenuItem {
             } else {
                 setPreviewMode("preview", vditor);
             }
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Record.ts b/src/ts/toolbar/Record.ts
@@ -17,10 +17,10 @@ export class Record extends MenuItem {
     public _bindEvent(vditor: IVditor) {
         let mediaRecorder: RecordMedia;
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
-            event.preventDefault();
             const editorElement = vditor.currentMode === "wysiwyg" ? vditor.wysiwyg.element : vditor.sv.element;
             if (!mediaRecorder) {
                 navigator.mediaDevices.getUserMedia({audio: true}).then((mediaStream: MediaStream) => {

diff --git a/src/ts/toolbar/Redo.ts b/src/ts/toolbar/Redo.ts
@@ -10,6 +10,7 @@ export class Redo extends MenuItem {
         this.element.children[0].innerHTML = menuItem.icon || redoSVG;
         disableToolbar({redo: this.element}, ["redo"]);
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
@@ -20,7 +21,6 @@ export class Redo extends MenuItem {
             } else if (vditor.currentMode === "ir") {
                 vditor.irUndo.redo(vditor);
             }
-            event.preventDefault();
         });
     }
 }
diff --git a/src/ts/toolbar/Undo.ts b/src/ts/toolbar/Undo.ts
@@ -10,6 +10,7 @@ export class Undo extends MenuItem {
         this.element.children[0].innerHTML = menuItem.icon || undoSVG;
         disableToolbar({undo: this.element}, ["undo"]);
         this.element.children[0].addEventListener(getEventName(), (event) => {
+            event.preventDefault();
             if (this.element.firstElementChild.classList.contains(Constants.CLASS_MENU_DISABLED)) {
                 return;
             }
@@ -20,7 +21,6 @@ export class Undo extends MenuItem {
             } else if (vditor.currentMode === "ir") {
                 vditor.irUndo.undo(vditor);
             }
-            event.preventDefault();
         });
     }
 }