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

Merge pull request #2091 from ONLYOFFICE/fix/bugfix

Browse source 
[DE][PE] Fix Bug 59911
This commit is contained in:
Julia Radzhabova 2022-11-28 14:13:07 +03:00 committed by GitHub
parent 43617a9729 70d6ecb6dc
commit 1ef412c1ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -2466,7 +2466,7 @@ define([
this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
this.getApplication().getController('RightMenu').updateMetricUnit(); this.getApplication().getController('RightMenu').updateMetricUnit();
this.getApplication().getController('Toolbar').getView().updateMetricUnit(); this.getApplication().getController('Toolbar').getView().updateMetricUnit();
this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit(); this.appOptions.canPreviewPrint && this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit();
}, },
onAdvancedOptions: function(type, advOptions, mode, formatOptions) { onAdvancedOptions: function(type, advOptions, mode, formatOptions) {

1
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -2619,6 +2619,7 @@ define([
}, },
updateMetricUnit: function() { updateMetricUnit: function() {
if (!this.cmbPaperSize) return;
var store = this.cmbPaperSize.store; var store = this.cmbPaperSize.store;
for (var i=0; i<store.length-1; i++) { for (var i=0; i<store.length-1; i++) {
var item = store.at(i), var item = store.at(i),

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1928,7 +1928,7 @@ define([
Common.Utils.InternalSettings.set("pe-settings-unit", value); Common.Utils.InternalSettings.set("pe-settings-unit", value);
this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
this.getApplication().getController('RightMenu').updateMetricUnit(); this.getApplication().getController('RightMenu').updateMetricUnit();
this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit(); this.appOptions.canPreviewPrint && this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit();
}, },
updateThemeColors: function() { updateThemeColors: function() {

1
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -2089,6 +2089,7 @@ define([
}, },
updateMetricUnit: function() { updateMetricUnit: function() {
if (!this.cmbPaperSize) return;
var store = this.cmbPaperSize.store; var store = this.cmbPaperSize.store;
for (var i=0; i<store.length; i++) { for (var i=0; i<store.length; i++) {
var item = store.at(i), var item = store.at(i),