Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Unreleased

* Fix bug to check that Window localStorage is available for use.

## 2.4.0 (September 4, 2015)

* Add support for passing callback functions to logEvent
Expand Down
17 changes: 16 additions & 1 deletion amplitude.js
Original file line number Diff line number Diff line change
Expand Up @@ -1572,7 +1572,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
Expand Down
4 changes: 2 additions & 2 deletions amplitude.min.js

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion src/localstorage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down