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

Merge pull request #2127 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 60103
This commit is contained in:
Julia Radzhabova 2022-12-12 17:19:24 +03:00 committed by GitHub
parent 835b383670 60520b232c
commit d90da06528
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2670,8 +2670,8 @@ define([
pagewidth = size[0], pagewidth = size[0],
pageheight = size[1]; pageheight = size[1];
item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' + item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')'); parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ')');
} }
this.cmbPaperSize.onResetItems(); this.cmbPaperSize.onResetItems();
this.cmbPaperMargins.onResetItems(); this.cmbPaperMargins.onResetItems();

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

@ -2117,8 +2117,8 @@ define([
pagewidth = size[0], pagewidth = size[0],
pageheight = size[1]; pageheight = size[1];
item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' + item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')'); parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ')');
} }
var value = this.cmbPaperSize.getValue(); var value = this.cmbPaperSize.getValue();
this.cmbPaperSize.onResetItems(); this.cmbPaperSize.onResetItems();

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -2729,8 +2729,8 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
pagewidth = /^\d{3}\.?\d*/.exec(value), pagewidth = /^\d{3}\.?\d*/.exec(value),
pageheight = /\d{3}\.?\d*$/.exec(value); pageheight = /\d{3}\.?\d*$/.exec(value);
item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' + item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')'); parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ')');
} }
this.cmbPaperSize.onResetItems(); this.cmbPaperSize.onResetItems();
}, },

4
apps/spreadsheeteditor/main/app/view/PrintSettings.js
View file

@ -345,8 +345,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
pagewidth = /^\d{3}\.?\d*/.exec(value), pagewidth = /^\d{3}\.?\d*/.exec(value),
pageheight = /\d{3}\.?\d*$/.exec(value); pageheight = /\d{3}\.?\d*$/.exec(value);
item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' + item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')'); parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ')');
} }
this.cmbPaperSize.onResetItems(); this.cmbPaperSize.onResetItems();
}, },