strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix uncaught exception on localStorage

Browse source 
3rd party cookies or localstorage can be blocked
on the browser settings, especially is on chrome incognito
mode. This causes the document fail to load.

Change-Id: Ia2a182262a754c76aec58cbbce60a0298320df33
Signed-off-by: mert <mert.tumer@collabora.com>
This commit is contained in:
mert 2020-10-06 13:42:28 +03:00 committed by Mert Tümer
parent e4a193b47f
commit 867e4a7f67
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
loleaflet/html/loleaflet.html.m4
View file

@ -102,6 +102,16 @@ var Base64ToArrayBuffer = function(base64Str) {
window.fullyLoadedAndReady = true;
}, false);
window.isLocalStorageAllowed = (function() {
var str = 'localstorage_test';
try {
localStorage.setItem(str, str);
localStorage.removeItem(str);
return true;
} catch(e) {
return false;
}
})();
</script>
m4_dnl In the debug case, just write all the .css files here

7
loleaflet/src/control/Control.UIManager.js
View file

@ -375,13 +375,16 @@ L.Control.UIManager = L.Control.extend({
},
setSavedState: function(name, state) {
localStorage.setItem('UIDefaults_' + this.map.getDocType() + '_' + name, state);
if (window.isLocalStorageAllowed)
localStorage.setItem('UIDefaults_' + this.map.getDocType() + '_' + name, state);
},
getSavedStateOrDefault: function(name) {
var retval = true;
var docType = this.map.getDocType();
var state = localStorage.getItem('UIDefaults_' + docType + '_' + name);
var state = null;
if (window.isLocalStorageAllowed)
state = localStorage.getItem('UIDefaults_' + docType + '_' + name);
switch (state) {
case 'true':
return true;

2
loleaflet/src/control/Toolbar.js
View file

@ -476,7 +476,7 @@ L.Map.include({
},
shouldWelcome: function() {
if (!window.enableWelcomeMessage || L.Browser.cypressTest)
if (!window.isLocalStorageAllowed || !window.enableWelcomeMessage || L.Browser.cypressTest)
return false;
var storedVersion = localStorage.getItem('WSDWelcomeVersion');