web-manager 2.1.28 → 2.1.32

package/index.js

@@ -1220,6 +1220,7 @@ function Manager() {
       if (setting.enabled === true) {
         function _post() {
           // This.log('Loaded Firebase.');
+          // console.log('_post.');
           window.app = firebase.initializeApp(setting.config);
 
           Promise.all([
@@ -1231,8 +1232,9 @@ function Manager() {
           .catch(reject);
         }
         if (setting.load) {
-          setting.load()
-          _post()
+          setting.load(This)
+          .then(_post)
+          .catch(reject);
         } else {
           import('firebase/app')
           .then(function(mod) {
@@ -1241,9 +1243,8 @@ function Manager() {
            })
            .catch(reject);
         }
-        return resolve()
       } else {
-        return resolve();
+        resolve();
       }
     });
   }
@@ -1257,15 +1258,16 @@ function Manager() {
       var setting = options.libraries.firebase_auth;
       if (setting.enabled === true) {
         if (setting.load) {
-          setting.load()
-          resolve()
+          setting.load(This)
+          .then(resolve)
+          .catch(reject);
         } else {
           import('firebase/auth')
           .then(resolve)
           .catch(reject);
         }
       } else {
-        return resolve();
+        resolve();
       }
 
     });
@@ -1280,15 +1282,16 @@ function Manager() {
       var setting = options.libraries.firebase_firestore;
       if (setting.enabled === true) {
         if (setting.load) {
-          setting.load()
-          resolve()
+          setting.load(This)
+          .then(resolve)
+          .catch(reject);
         } else {
           import('firebase/firestore')
           .then(resolve)
           .catch(reject);
         }
       } else {
-        return resolve();
+        resolve();
       }
     });
   }
@@ -1301,15 +1304,16 @@ function Manager() {
       var setting = options.libraries.firebase_messaging;
       if (setting.enabled === true) {
         if (setting.load) {
-          setting.load()
-          resolve()
+          setting.load(This)
+          .then(resolve)
+          .catch(reject);
         } else {
           import('firebase/messaging')
           .then(resolve)
           .catch(reject);
         }
       } else {
-        return resolve();
+        resolve();
       }
     });
   }
@@ -1336,7 +1340,7 @@ function Manager() {
         })
         .catch(reject);
       } else {
-        return resolve();
+        resolve();
       }
     });
   }
@@ -1351,11 +1355,11 @@ function Manager() {
         .then(function(mod) {
           window.cookieconsent.initialise(options.libraries.cookieconsent.config);
           // This.log('Loaded Cookieconsent.');
-          return resolve();
+          resolve();
         })
         .catch(reject);
       } else {
-        return resolve();
+        resolve();
       }
 
     });
@@ -1379,11 +1383,11 @@ function Manager() {
             return reject(e);
           }
           // This.log('Loaded tawk.');
-          return resolve();
+          resolve();
         })
 
       } else {
-        return resolve();
+        resolve();
       }
     });
   }
@@ -1402,11 +1406,11 @@ function Manager() {
           config.environment = This.properties.meta.environment;
           Sentry.init(config);
           // This.log('Loaded Sentry.');
-          return resolve();
+          resolve();
         })
         .catch(reject);
       } else {
-        return resolve();
+        resolve();
       }
     });
   }

package/lib/account.js

@@ -3,17 +3,21 @@
 var dom;
 var utilities;
 
-function Account() {
+function Account(init) {
   var self = this;
+  init = init || {};
   self.properties = {};
-
-  dom = self.Manager.dom();
-  utilities = self.Manager.utilities();
-
   self.accountPageInitialized = false;
 
-  if (new URL(window.location.href).pathname.includes('account')) {
-    self.initializeAccountPage();
+  try {
+    dom = init.dom || self.Manager.dom();
+    utilities = init.utilities || self.Manager.utilities();
+
+    if (new URL(window.location.href).pathname.includes('account')) {
+      self.initializeAccountPage();
+    }
+  } catch (e) {
+    console.error('Failed to initialize libraries');
   }
 
   // var pastDate = new Date(0);
@@ -192,6 +196,7 @@ function getMonth(date) {
 
 Account.prototype._resolveAccount = function (currentUser, account, options) {
   var self = this;
+  currentUser = currentUser || {};
   account = account || {};
   options = options || {};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "2.1.28",
+  "version": "2.1.32",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {