do not assign storage immediatelly when module is required. closes #36

colyseus · Jul 17, 2018 · e7f5f2d · e7f5f2d
1 parent 922f270
commit e7f5f2d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/dist/colyseus.js b/dist/colyseus.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "colyseus.js",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "Multiplayer Game Client for the Browser",
   "keywords": [
     "multiplayer",

diff --git a/src/Storage.ts b/src/Storage.ts
@@ -1,13 +1,21 @@
-const storage: Storage = (typeof (cc) !== 'undefined' && cc.sys && cc.sys.localStorage)
-    ? cc.sys.localStorage  // compatibility with cocos creator
-    : window.localStorage; // regular browser environment
+/**
+ * We do not assign 'storage' to window.localStorage immediatelly for React
+ * Native compatibility. window.localStorage is not present when this module is
+ * loaded.
+ */
+
+function getStorage () {
+    return (typeof (cc) !== 'undefined' && cc.sys && cc.sys.localStorage)
+        ? cc.sys.localStorage  // compatibility with cocos creator
+        : window.localStorage; // regular browser environment
+}
 
 export function setItem(key: string, value: string) {
-    storage.setItem(key, value);
+    getStorage().setItem(key, value);
 }
 
 export function getItem(key: string, callback: Function) {
-    const value: any = storage.getItem(key);
+    const value: any = getStorage().getItem(key);
 
     if (
         typeof (Promise) === 'undefined' || // old browsers