Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1092 from ONLYOFFICE/fix/bugfix

Browse source 
Fix loading when localStorage is not available
This commit is contained in:
Julia Radzhabova 2021-08-18 13:54:15 +03:00 committed by GitHub
parent efc44fc2e5 36f63c87b8
commit 196ca4ed78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/common/main/lib/util/htmlutils.js
View file

@ -42,7 +42,17 @@ var params = (function() {
return urlParams; return urlParams;
})(); })();
if ( !!params.uitheme && !localStorage.getItem("ui-theme-id") ) { var checkLocalStorage = (function () {
try {
var storage = window['localStorage'];
return true;
}
catch(e) {
return false;
}
})();
if ( !!params.uitheme && checkLocalStorage && !localStorage.getItem("ui-theme-id") ) {
// const _t = params.uitheme.match(/([\w-]+)/g); // const _t = params.uitheme.match(/([\w-]+)/g);
if ( params.uitheme == 'default-dark' ) if ( params.uitheme == 'default-dark' )
@ -54,11 +64,11 @@ if ( !!params.uitheme && !localStorage.getItem("ui-theme-id") ) {
localStorage.setItem("ui-theme-id", params.uitheme); localStorage.setItem("ui-theme-id", params.uitheme);
} }
var ui_theme_name = localStorage.getItem("ui-theme-id"); var ui_theme_name = checkLocalStorage ? localStorage.getItem("ui-theme-id") : undefined;
if ( !ui_theme_name ) { if ( !ui_theme_name ) {
if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) { if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) {
ui_theme_name = 'theme-dark'; ui_theme_name = 'theme-dark';
localStorage.setItem("ui-theme-id", ui_theme_name); checkLocalStorage && localStorage.setItem("ui-theme-id", ui_theme_name);
} }
} }
if ( !!ui_theme_name ) { if ( !!ui_theme_name ) {