fix: self and global error in alipay appx (#2072)

mobxjs · Aug 9, 2019 · 9a40d66 · 9a40d66
1 parent 97218df
commit 9a40d66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/utils/iterable.ts b/src/utils/iterable.ts
@@ -15,14 +15,14 @@ export function declareIterator<T>(prototType, iteratorFactory: () => IterableIt
 }
 
 export function makeIterable<T>(iterator: Iterator<T>): IterableIterator<T> {
-    iterator[iteratorSymbol()] = self
+    iterator[iteratorSymbol()] = getSelf
     return iterator as any
 }
 
 export function toStringTagSymbol() {
     return (typeof Symbol === "function" && Symbol.toStringTag) || "@@toStringTag"
 }
 
-function self() {
+function getSelf() {
     return this
 }
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -20,8 +20,16 @@ Object.freeze(EMPTY_OBJECT)
 
 declare const window: any
 
+const mockGlobal = {}
+
 export function getGlobal() {
-    return typeof window !== "undefined" ? window : global
+    if (typeof window !== "undefined") {
+        return window
+    }
+    if (typeof global !== "undefined") {
+        return global
+    }
+    return mockGlobal
 }
 
 export interface Lambda {