Merge pull request #40 from Voark/fix-onload

Fix Onload Error
ArianaKhit · Apr 24, 2022 · 8183dc8 · 8183dc8
2 parents 5e8f0a5 + 007b878
commit 8183dc8
Show file tree

Hide file tree

Showing 4 changed files with 317 additions and 124 deletions.
diff --git a/main.js b/main.js
diff --git a/main.ts b/main.ts
@@ -38,17 +38,19 @@ export default class TextSnippets extends Plugin {
 			}
 		});
 
-		if(this.settings.isWYSISWYG) {
-			let editor = this.app.workspace.activeLeaf.view.sourceMode.cmEditor;
-			this.settings.isWYSISWYG = (typeof editor.wordAt === 'function');
-			this.registerDomEvent(document, 'keydown', (event: KeyboardEvent) => this.handleKeyDown(editor, event));
-		}
+        if (this.settings.isWYSISWYG) {
+            this.app.workspace.onLayoutReady(() => {
+                let editor = this.app.workspace.activeLeaf.view.sourceMode.cmEditor;
+                this.settings.isWYSISWYG = (typeof editor.wordAt === 'function');
+                this.registerDomEvent(document, 'keydown', (event) => this.handleKeyDown(editor, event));
+            }
+        )}
 
 		this.addSettingTab(new TextSnippetsSettingsTab(this.app, this));
 		await this.saveSettings();
 	}
 
-	onunload() {
+	async onunload() {
 		console.log("Unloading text snippet plugin");