diff --git a/apps/common/main/lib/util/desktopinit.js b/apps/common/main/lib/util/desktopinit.js index d804ed9f08..47d56d8c7a 100644 --- a/apps/common/main/lib/util/desktopinit.js +++ b/apps/common/main/lib/util/desktopinit.js @@ -68,8 +68,9 @@ if ( window.AscDesktopEditor ) { } if ( window.RendererProcessVariable.rtl !== undefined ) { - const nativevars = window.RendererProcessVariable; - localStorage.setItem("ui-rtl", (nativevars.rtl == 'yes' || nativevars.rtl == 'true') ? 1 : 0); + window.native = { + rtl: window.RendererProcessVariable.rtl === true || window.RendererProcessVariable.rtl == "yes" || window.RendererProcessVariable.rtl == "true" + }; } } diff --git a/apps/common/main/lib/util/htmlutils.js b/apps/common/main/lib/util/htmlutils.js index 82fbe5a7bb..380c52fb67 100644 --- a/apps/common/main/lib/util/htmlutils.js +++ b/apps/common/main/lib/util/htmlutils.js @@ -46,7 +46,17 @@ if (!window.lang) { window.lang = window.lang ? window.lang[1] : ''; } window.lang && (window.lang = window.lang.split(/[\-\_]/)[0].toLowerCase()); -if ( !isIE && (checkLocalStorage && localStorage.getItem("ui-rtl") === '1' || (!checkLocalStorage || localStorage.getItem("ui-rtl") === null) && window.lang==='ar')) { + +var ui_rtl = false; +if ( window.native && window.native.rtl !== undefined ) { + ui_rtl = window.native.rtl; +} else { + if ( checkLocalStorage && localStorage.getItem("ui-rtl") !== null ) + ui_rtl = localStorage.getItem("ui-rtl") === '1'; + else ui_rtl = lang === 'ar'; +} + +if ( ui_rtl && !isIE ) { document.body.setAttribute('dir', 'rtl'); document.body.classList.add('rtl'); }