Skip to content

Commit 4e4df83

Browse files
Avoid using wrapper for validation
1 parent fb3b97a commit 4e4df83

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1+
/* eslint-disable no-undef */
12
export function isLocalStorageAvailable(): boolean {
3+
var mod = '__SPLITSOFTWARE__';
24
try {
3-
// eslint-disable-next-line no-undef
4-
return isValidStorageWrapper(localStorage);
5+
localStorage.setItem(mod, mod);
6+
localStorage.removeItem(mod);
7+
return true;
58
} catch (e) {
69
return false;
710
}
811
}
912

1013
export function isValidStorageWrapper(wrapper: any): boolean {
11-
var mod = '__SPLITSOFTWARE__';
12-
try {
13-
wrapper.setItem(mod, mod);
14-
wrapper.getItem(mod);
15-
wrapper.removeItem(mod);
16-
return true;
17-
} catch (e) {
18-
return false;
19-
}
14+
return wrapper !== null &&
15+
typeof wrapper === 'object' &&
16+
typeof wrapper.setItem === 'function' &&
17+
typeof wrapper.getItem === 'function' &&
18+
typeof wrapper.removeItem === 'function';
2019
}

0 commit comments

Comments
 (0)