diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index 8cbcc6cfe..8f1d05ee0 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -315,21 +315,13 @@ define([ this.btnInterfaceTheme.updateHint(this.tipInterfaceTheme); this.btnDarkDocument.updateHint(this.tipDarkDocument); - var value = Common.localStorage.getItem("de-hidden-leftmenu"); - if (value===null) { - value = Common.UI.LayoutManager.getInitValue('leftMenu'); - value = (value!==undefined) ? !value : false; - } else - value = (parseInt(value) == 1); - this.chLeftMenu.setValue(!value); + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + this.chLeftMenu.setValue(!Common.localStorage.getBool("de-hidden-leftmenu", value)); - value = Common.localStorage.getItem("de-hidden-rightmenu"); - if (value===null) { - value = Common.UI.LayoutManager.getInitValue('rightMenu'); - value = (value!==undefined) ? !value : false; - } else - value = (parseInt(value) == 1); - this.chRightMenu.setValue(!value); + value = Common.UI.LayoutManager.getInitValue('rightMenu'); + value = (value!==undefined) ? !value : false; + this.chRightMenu.setValue(!Common.localStorage.getBool("de-hidden-rightmenu", value)); }, show: function () { diff --git a/apps/documenteditor/main/app/view/Viewport.js b/apps/documenteditor/main/app/view/Viewport.js index 61c7c3473..2ee5fcc65 100644 --- a/apps/documenteditor/main/app/view/Viewport.js +++ b/apps/documenteditor/main/app/view/Viewport.js @@ -141,26 +141,18 @@ define([ rightMenuView = DE.getController('RightMenu').getView('RightMenu'); me._rightMenu = rightMenuView.render(this.mode); - var value = Common.localStorage.getItem("de-hidden-rightmenu"); - if (value===null) { - value = Common.UI.LayoutManager.getInitValue('rightMenu'); - value = (value!==undefined) ? !value : false; - } else - value = (parseInt(value) == 1); - value && me._rightMenu.hide(); + var value = Common.UI.LayoutManager.getInitValue('rightMenu'); + value = (value!==undefined) ? !value : false; + Common.localStorage.getBool("de-hidden-rightmenu", value) && me._rightMenu.hide(); }, applyCommonMode: function() { if ( Common.localStorage.getBool('de-hidden-status') ) DE.getController('Statusbar').getView('Statusbar').setVisible(false); - var value = Common.localStorage.getItem("de-hidden-leftmenu"); - if (value===null) { - value = Common.UI.LayoutManager.getInitValue('leftMenu'); - value = (value!==undefined) ? !value : false; - } else - value = (parseInt(value) == 1); - value && DE.getController('LeftMenu').getView('LeftMenu').hide(); + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + Common.localStorage.getBool("de-hidden-leftmenu", value) && DE.getController('LeftMenu').getView('LeftMenu').hide(); }, setMode: function(mode) { diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index a3d1bc2a1..d916bdb5b 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -164,7 +164,10 @@ define([ this.leftMenu.getMenu('file').setApi(api); if (this.mode.canUseHistory) this.getApplication().getController('Common.Controllers.History').setApi(this.api).setMode(this.mode); - this.isThumbsShown = !Common.localStorage.getBool('pe-hidden-leftmenu'); + + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + this.isThumbsShown = !Common.localStorage.getBool("pe-hidden-leftmenu", value); this.leftMenu.btnThumbs.toggle(this.isThumbsShown); this.getApplication().getController('Search').setApi(this.api).setMode(this.mode); this.leftMenu.setOptionsPanel('advancedsearch', this.getApplication().getController('Search').getView('Common.Views.SearchPanel')); diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js index a311caa74..d59ee3fc5 100644 --- a/apps/presentationeditor/main/app/view/ViewTab.js +++ b/apps/presentationeditor/main/app/view/ViewTab.js @@ -322,7 +322,6 @@ define([ this.chRightMenu = new Common.UI.CheckBox({ lock: [_set.disableOnStart], labelText: this.textRightMenu, - value: !Common.localStorage.getBool("pe-hidden-rightmenu"), dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -332,7 +331,6 @@ define([ this.chLeftMenu = new Common.UI.CheckBox({ lock: [_set.disableOnStart], labelText: this.textLeftMenu, - value: !Common.localStorage.getBool("pe-hidden-leftmenu"), dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -469,6 +467,14 @@ define([ } } + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + me.chLeftMenu.setValue(!Common.localStorage.getBool("pe-hidden-leftmenu", value)); + + value = Common.UI.LayoutManager.getInitValue('rightMenu'); + value = (value!==undefined) ? !value : false; + me.chRightMenu.setValue(!Common.localStorage.getBool("pe-hidden-rightmenu", value)); + me.setEvents(); }); }, diff --git a/apps/presentationeditor/main/app/view/Viewport.js b/apps/presentationeditor/main/app/view/Viewport.js index 183ad8534..3e2a288a1 100644 --- a/apps/presentationeditor/main/app/view/Viewport.js +++ b/apps/presentationeditor/main/app/view/Viewport.js @@ -142,16 +142,18 @@ define([ rightMenuView = PE.getController('RightMenu').getView('RightMenu'); me._rightMenu = rightMenuView.render(this.mode); - if ( Common.localStorage.getBool('pe-hidden-rightmenu') ) - me._rightMenu.hide(); + var value = Common.UI.LayoutManager.getInitValue('rightMenu'); + value = (value!==undefined) ? !value : false; + Common.localStorage.getBool("pe-hidden-rightmenu", value) && me._rightMenu.hide(); }, applyCommonMode: function() { if ( Common.localStorage.getBool('pe-hidden-status') ) PE.getController('Statusbar').getView('Statusbar').setVisible(false); - if ( Common.localStorage.getBool('pe-hidden-leftmenu') ) - PE.getController('LeftMenu').getView('LeftMenu').hide(); + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + Common.localStorage.getBool("pe-hidden-leftmenu", value) && PE.getController('LeftMenu').getView('LeftMenu').hide(); }, setMode: function(mode, delay) { diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js index 5eeb0d722..999a30728 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js @@ -325,7 +325,6 @@ define([ this.chRightMenu = new Common.UI.CheckBox({ lock: [_set.lostConnect], labelText: this.textRightMenu, - value: !Common.localStorage.getBool("sse-hidden-rightmenu"), dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -335,7 +334,6 @@ define([ this.chLeftMenu = new Common.UI.CheckBox({ lock: [_set.lostConnect], labelText: this.textLeftMenu, - value: !Common.localStorage.getBool("sse-hidden-leftmenu"), dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -481,6 +479,15 @@ define([ }, me)); } } + + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + me.chLeftMenu.setValue(!Common.localStorage.getBool("sse-hidden-leftmenu", value)); + + value = Common.UI.LayoutManager.getInitValue('rightMenu'); + value = (value!==undefined) ? !value : false; + me.chRightMenu.setValue(!Common.localStorage.getBool("sse-hidden-rightmenu", value)); + setEvents.call(me); }); }, diff --git a/apps/spreadsheeteditor/main/app/view/Viewport.js b/apps/spreadsheeteditor/main/app/view/Viewport.js index dd15ef0e0..b1235c765 100644 --- a/apps/spreadsheeteditor/main/app/view/Viewport.js +++ b/apps/spreadsheeteditor/main/app/view/Viewport.js @@ -162,13 +162,15 @@ define([ rightMenuView = SSE.getController('RightMenu').getView('RightMenu'); me._rightMenu = rightMenuView.render(this.mode); - if ( Common.localStorage.getBool('sse-hidden-rightmenu') ) - me._rightMenu.hide(); + var value = Common.UI.LayoutManager.getInitValue('rightMenu'); + value = (value!==undefined) ? !value : false; + Common.localStorage.getBool("sse-hidden-rightmenu", value) && me._rightMenu.hide(); }, applyCommonMode: function() { - if ( Common.localStorage.getBool('sse-hidden-leftmenu') ) - SSE.getController('LeftMenu').getView('LeftMenu').hide(); + var value = Common.UI.LayoutManager.getInitValue('leftMenu'); + value = (value!==undefined) ? !value : false; + Common.localStorage.getBool("sse-hidden-leftmenu", value) && SSE.getController('LeftMenu').getView('LeftMenu').hide(); }, setMode: function(mode, delay) {