diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 207f3b813..c909e3ff4 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -2398,7 +2398,7 @@ define([ }, onLockViewProps: function(lock) { - this.documentHolder && (this.documentHolder._state.viewPropsLock = lock); + Common.Utils.InternalSettings.set("pe-lock-view-props", lock); var me = this, currentMenu = me.documentHolder.currentMenu; diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js index d08b3409c..9cc92668f 100644 --- a/apps/presentationeditor/main/app/controller/ViewTab.js +++ b/apps/presentationeditor/main/app/controller/ViewTab.js @@ -375,6 +375,7 @@ define([ onLockViewProps: function(lock) { this._state.lock_viewProps = lock; + Common.Utils.InternalSettings.set("pe-lock-view-props", lock); if (this.view) { if (this.view.btnGridlines && (typeof this.view.btnGridlines.menu === 'object') && this.view.btnGridlines.menu.isVisible()) this.onGridlinesAfterShow(); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 3bb73ee7b..00508b82a 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1036,10 +1036,11 @@ define([ } me.mnuGuides.menu.items[6].setChecked(me.api.asc_getShowSmartGuides(), true); - me.mnuGuides.menu.items[2].setDisabled(me._state.viewPropsLock); - me.mnuGuides.menu.items[3].setDisabled(me._state.viewPropsLock); - me.mnuGuides.menu.items[4].setDisabled(me._state.viewPropsLock); - me.mnuGuides.menu.items[7].setDisabled(me._state.viewPropsLock || !me.api.asc_canClearGuides()); + var viewPropsLock = !!Common.Utils.InternalSettings.get("pe-lock-view-props"); + me.mnuGuides.menu.items[2].setDisabled(viewPropsLock); + me.mnuGuides.menu.items[3].setDisabled(viewPropsLock); + me.mnuGuides.menu.items[4].setDisabled(viewPropsLock); + me.mnuGuides.menu.items[7].setDisabled(viewPropsLock || !me.api.asc_canClearGuides()); me.mnuGridlines.menu.items[0].setChecked(me.api.asc_getShowGridlines(), true); me.mnuGridlines.menu.items[1].setChecked(me.api.asc_getSnapToGrid(), true); @@ -1072,10 +1073,10 @@ define([ item.setChecked(true); else item.setChecked(false); - item.setDisabled(me._state.viewPropsLock); + item.setDisabled(viewPropsLock); } - me.mnuGridlines.menu.items[1].setDisabled(me._state.viewPropsLock); - me.mnuGridlines.menu.items[items.length-1].setDisabled(me._state.viewPropsLock); + me.mnuGridlines.menu.items[1].setDisabled(viewPropsLock); + me.mnuGridlines.menu.items[items.length-1].setDisabled(viewPropsLock); me.mnuRulers.setChecked(!Common.Utils.InternalSettings.get("pe-hidden-rulers")); }