Fix: Cannot completely load modules

AnYiEE · Oct 5, 2023 · 4195102 · 4195102
1 parent ba6f99c
commit 4195102
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/static/wikimirror.js b/static/wikimirror.js
diff --git a/static/wikimirror.tsc.js b/static/wikimirror.tsc.js
@@ -292,13 +292,14 @@
 		async init() {
 			const moduleLoader = (modules) => {
 				for (const [moduleName, {enable, isStatic, parameter}] of Object.entries(modules)) {
-					if (WikiMirrorPrivateMethod.isValidKey(this, moduleName) && enable) {
-						if (isStatic) {
-							WikiMirrorPrivateMethod[moduleName](parameter);
-						} else {
-							this[moduleName](parameter);
-						}
+					if (!enable) {
+						continue;
+					}
+					const target = isStatic ? WikiMirrorPrivateMethod : this;
+					if (!WikiMirrorPrivateMethod.isValidKey(target, moduleName, false)) {
+						continue;
 					}
+					target[moduleName](parameter);
 				}
 			};
 			// stand alone functions
@@ -1895,8 +1896,9 @@
 				},
 			};
 		}
-		static isValidKey(object, key) {
-			return Object.hasOwn(object, key) && key in object;
+		static isValidKey(object, key, checkOwnPropertyOnly = true) {
+			const isOwnProperty = checkOwnPropertyOnly ? Object.hasOwn(object, key) : true;
+			return isOwnProperty && key in object;
 		}
 		static localStorage(name, value) {
 			const isStorageEnable = (() => {