updating from master

Author: djih

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Unreleased
 
 * Add support for passing callback function to init.
+* Fix bug to check that Window localStorage is available for use.
 
 ## 2.4.0 (September 4, 2015)
 

amplitude.js

@@ -1576,7 +1576,22 @@ module.exports = {
  */
 var localStorage; // jshint ignore:line
 
-if (window.localStorage) {
+// test that Window.localStorage is available and works
+function windowLocalStorageAvailable() {
+  var uid = new Date();
+  var result;
+  try {
+    window.localStorage.setItem(uid, uid);
+    result = window.localStorage.getItem(uid) === String(uid);
+    window.localStorage.removeItem(uid);
+    return result;
+  } catch (e) {
+    // localStorage not available
+  }
+  return false;
+}
+
+if (windowLocalStorageAvailable()) {
   localStorage = window.localStorage;
 } else if (window.globalStorage) {
   // Firefox 2-3 use globalStorage

amplitude.min.js

@@ -5,7 +5,22 @@
  */
 var localStorage; // jshint ignore:line
 
-if (window.localStorage) {
+// test that Window.localStorage is available and works
+function windowLocalStorageAvailable() {
+  var uid = new Date();
+  var result;
+  try {
+    window.localStorage.setItem(uid, uid);
+    result = window.localStorage.getItem(uid) === String(uid);
+    window.localStorage.removeItem(uid);
+    return result;
+  } catch (e) {
+    // localStorage not available
+  }
+  return false;
+}
+
+if (windowLocalStorageAvailable()) {
   localStorage = window.localStorage;
 } else if (window.globalStorage) {
   // Firefox 2-3 use globalStorage