Merge pull request #47 from amplitude/handle_session_storage_disabled

Handle session storage disabled

Author: djih

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+* Fix bug where saveReferrer throws exception if sessionStorage is disabled.
+
 ## 2.9.0 (January 15, 2016)
 
 * Add ability to clear all user properties.

amplitude.js

@@ -496,10 +496,17 @@ Amplitude.prototype._saveReferrer = function(referrer) {
   identify.setOnce('initial_referring_domain', referring_domain);
 
   // only save referrer if not already in session storage or if storage disabled
-  var hasSessionStorage = window.sessionStorage ? true : false;
-  if ((hasSessionStorage && !window.sessionStorage.getItem(LocalStorageKeys.REFERRER)) || !hasSessionStorage) {
-    identify.set('referrer', referrer).set('referring_domain', referring_domain);
+  var hasSessionStorage = false;
+  try {
+    if (window.sessionStorage) {
+      hasSessionStorage = true;
+    }
+  } catch (e) {
+    // log(e);  // sessionStorage disabled
+  }
 
+  if (!hasSessionStorage || (hasSessionStorage && !window.sessionStorage.getItem(LocalStorageKeys.REFERRER))) {
+    identify.set('referrer', referrer).set('referring_domain', referring_domain);
     if (hasSessionStorage) {
       window.sessionStorage.setItem(LocalStorageKeys.REFERRER, referrer);
     }

amplitude.min.js

@@ -390,10 +390,17 @@ Amplitude.prototype._saveReferrer = function(referrer) {
   identify.setOnce('initial_referring_domain', referring_domain);
 
   // only save referrer if not already in session storage or if storage disabled
-  var hasSessionStorage = window.sessionStorage ? true : false;
-  if ((hasSessionStorage && !window.sessionStorage.getItem(LocalStorageKeys.REFERRER)) || !hasSessionStorage) {
-    identify.set('referrer', referrer).set('referring_domain', referring_domain);
+  var hasSessionStorage = false;
+  try {
+    if (window.sessionStorage) {
+      hasSessionStorage = true;
+    }
+  } catch (e) {
+    // log(e);  // sessionStorage disabled
+  }
 
+  if (!hasSessionStorage || (hasSessionStorage && !window.sessionStorage.getItem(LocalStorageKeys.REFERRER))) {
+    identify.set('referrer', referrer).set('referring_domain', referring_domain);
     if (hasSessionStorage) {
       window.sessionStorage.setItem(LocalStorageKeys.REFERRER, referrer);
     }