Merge pull request #84 from obgnail/dev

hotfix: 兼容延迟加载
obgnail · Aug 15, 2023 · b0f2e0e · b0f2e0e
2 parents ce84dd3 + 34b975f
commit b0f2e0e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/plugin/auto_number.js b/plugin/auto_number.js
@@ -261,8 +261,21 @@
             }
         }
 
-        global._pluginUtils.decorate(() => !!File, File.editor.export, "exportToHTML", decoMixin.beforeExport, null);
-        global._pluginUtils.decorate(() => !!File, File.editor.library.outline, "getHeaderMatrix", null, decoMixin.afterGetHeaderMatrix);
+        global._pluginUtils.decorate(
+            () => (File && File.editor && File.editor.export && File.editor.export.exportToHTML),
+            File.editor.export,
+            "exportToHTML",
+            decoMixin.beforeExport,
+            null
+        );
+        global._pluginUtils.decorate(
+            () => (File && File.editor && File.editor.library && File.editor.library.outline
+                && File.editor.library.outline.getHeaderMatrix),
+            File.editor.library.outline,
+            "getHeaderMatrix",
+            null,
+            decoMixin.afterGetHeaderMatrix
+        );
     }
 
     //////////////////////// 以下是声明式插件系统代码 ////////////////////////

diff --git a/plugin/global/utils.js b/plugin/global/utils.js
@@ -67,11 +67,11 @@
     }
 
     const decorateOpenFile = (before, after) => {
-        decorate(() => !!File, File.editor.library, "openFile", before, after)
+        decorate(() => (File && File.editor && File.editor.library && File.editor.library.openFile), File.editor.library, "openFile", before, after)
     }
 
     const decorateAddCodeBlock = (before, after) => {
-        decorate(() => !!File, File.editor.fences, "addCodeBlock", before, after)
+        decorate(() => (File && File.editor && File.editor.fences && File.editor.fences.addCodeBlock), File.editor.fences, "addCodeBlock", before, after)
     }
 
     const loopDetector = (until, after, detectInterval = 20) => {

diff --git a/plugin/read_only.js b/plugin/read_only.js
@@ -63,7 +63,7 @@
     global._pluginUtils.registerWindowHotkey(config.HOTKEY, call);
 
     global._pluginUtils.decorate(
-        () => !!File,
+        () => (File && File.freshLock),
         File,
         "freshLock",
         null,

diff --git a/plugin/test.js b/plugin/test.js
@@ -1,7 +1,7 @@
 (() => {
     // 打开新窗口后自动关闭
     global._pluginUtils.decorate(
-        () => !!File,
+        () => (File && File.editor && File.editor.library && File.editor.library.openFileInNewWindow),
         File.editor.library,
         "openFileInNewWindow",
         null,