supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #625 from thelounge/astorije/safe-localstorage

Browse Source 
Ensure localStorage cannot fail because of quota or Safari private browsing
This commit is contained in:
Jérémie Astori 2016-09-25 00:44:29 -04:00 committed by GitHub
commit 937cc4ebed
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/js/lounge.js
View File

@ -54,6 +54,16 @@ $(function() {
return Handlebars.templates[name](data); return Handlebars.templates[name](data);
} }
function setLocalStorageItem(key, value) {
try {
window.localStorage.setItem(key, value);
} catch (e) {
// Do nothing. If we end up here, web storage quota exceeded, or user is
// in Safari's private browsing where localStorage's setItem is not
// available. See http://stackoverflow.com/q/14555347/1935861.
}
}
Handlebars.registerHelper( Handlebars.registerHelper(
"partial", function(id) { "partial", function(id) {
return new Handlebars.SafeString(render(id, this)); return new Handlebars.SafeString(render(id, this));
@ -125,7 +135,7 @@ $(function() {
} }
if (data.token && window.localStorage.getItem("token") !== null) { if (data.token && window.localStorage.getItem("token") !== null) {
window.localStorage.setItem("token", data.token); setLocalStorageItem("token", data.token);
} }
passwordForm passwordForm
@ -144,7 +154,7 @@ $(function() {
} }
if (data.token && $("#sign-in-remember").is(":checked")) { if (data.token && $("#sign-in-remember").is(":checked")) {
window.localStorage.setItem("token", data.token); setLocalStorageItem("token", data.token);
} else { } else {
window.localStorage.removeItem("token"); window.localStorage.removeItem("token");
} }
@ -506,7 +516,7 @@ $(function() {
options[name] = self.val(); options[name] = self.val();
} }
window.localStorage.setItem("settings", JSON.stringify(options)); setLocalStorageItem("settings", JSON.stringify(options));
if ([ if ([
"join", "join",
@ -1005,7 +1015,7 @@ $(function() {
} }
}); });
if (values.user) { if (values.user) {
window.localStorage.setItem("user", values.user); setLocalStorageItem("user", values.user);
} }
socket.emit( socket.emit(
event, values event, values