diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 2afebab150..55021bca9a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1160,6 +1160,12 @@ define([ reviewController = application.getController('Common.Controllers.ReviewChanges'); reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.appOptions.spreadsheet}); + var value = Common.localStorage.getItem('sse-settings-unit'); + value = (value!==null) ? parseInt(value) : (me.appOptions.customization && me.appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[me.appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric()); + (value===undefined) && (value = Common.Utils.Metric.getDefaultMetric()); + Common.Utils.Metric.setCurrentMetric(value); + Common.Utils.InternalSettings.set("sse-settings-unit", value); + if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode var toolbarController = application.getController('Toolbar'); toolbarController && toolbarController.setApi(me.api); @@ -1190,12 +1196,6 @@ define([ this.toolbarView = toolbarController.getView('Toolbar'); - var value = Common.localStorage.getItem('sse-settings-unit'); - value = (value!==null) ? parseInt(value) : (me.appOptions.customization && me.appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[me.appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric()); - (value===undefined) && (value = Common.Utils.Metric.getDefaultMetric()); - Common.Utils.Metric.setCurrentMetric(value); - Common.Utils.InternalSettings.set("sse-settings-unit", value); - if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) { var options = {}; JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true); @@ -2118,9 +2118,11 @@ define([ value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); Common.Utils.Metric.setCurrentMetric(value); Common.Utils.InternalSettings.set("sse-settings-unit", value); - this.getApplication().getController('RightMenu').updateMetricUnit(); + if (this.appOptions.isEdit) { + this.getApplication().getController('RightMenu').updateMetricUnit(); + this.getApplication().getController('Toolbar').getView('Toolbar').updateMetricUnit(); + } this.getApplication().getController('Print').getView('MainSettingsPrint').updateMetricUnit(); - this.getApplication().getController('Toolbar').getView('Toolbar').updateMetricUnit(); }, _compareActionStrong: function(obj1, obj2){ diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 77546385cf..2f19fb766c 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -699,10 +699,10 @@ define([ '', '', '','', - '', + '', '', '', - '','', + '','', '', '', '',