vditor 3.8.4 → 3.8.8

package/src/ts/wysiwyg/index.ts

@@ -1,5 +1,4 @@
 import {Constants} from "../constants";
-import {i18n} from "../i18n";
 import {hidePanel} from "../toolbar/setToolbar";
 import {isCtrl, isFirefox} from "../util/compatibility";
 import {
@@ -40,6 +39,7 @@ class WYSIWYG {
     public preventInput: boolean;
     public composingLock = false;
     public commentIds: string[] = [];
+    private scrollListener: () => void;
 
     constructor(vditor: IVditor) {
         const divElement = document.createElement("div");
@@ -49,7 +49,7 @@ class WYSIWYG {
  contenteditable="true" spellcheck="false"></pre>
 <div class="vditor-panel vditor-panel--none"></div>
 <div class="vditor-panel vditor-panel--none">
-    <button type="button" aria-label="${i18n[vditor.options.lang].comment}" class="vditor-icon vditor-tooltipped vditor-tooltipped__n">
+    <button type="button" aria-label="${window.VditorI18n.comment}" class="vditor-icon vditor-tooltipped vditor-tooltipped__n">
         <svg><use xlink:href="#vditor-icon-comment"></use></svg>
     </button>
 </div>`;
@@ -196,6 +196,10 @@ class WYSIWYG {
         this.selectPopover.setAttribute("style", "display:none");
     }
 
+    public unbindListener() {
+        window.removeEventListener("scroll", this.scrollListener);
+    }
+
     private copy(event: ClipboardEvent, vditor: IVditor) {
         const range = getSelection().getRangeAt(0);
         if (range.toString() === "") {
@@ -239,7 +243,8 @@ class WYSIWYG {
     }
 
     private bindEvent(vditor: IVditor) {
-        window.addEventListener("scroll", () => {
+        this.unbindListener();
+        window.addEventListener("scroll", this.scrollListener = () => {
             hidePanel(vditor, ["hint"]);
             if (this.popover.style.display !== "block" || this.selectPopover.style.display !== "block") {
                 return;
@@ -332,7 +337,7 @@ class WYSIWYG {
                 this.preventInput = false;
                 return;
             }
-            if (this.composingLock ||  event.data === "‘" || event.data === "“" || event.data === "《") {
+            if (this.composingLock || event.data === "‘" || event.data === "“" || event.data === "《") {
                 return;
             }
             const range = getSelection().getRangeAt(0);