From 7a9b4578217120a766295357dd1d76b5c1bbff45 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 13 Sep 2018 15:57:03 +0300 Subject: [PATCH] [SSE][DE mobile] Fix page size (for rev.https://github.com/ONLYOFFICE/web-apps-pro/commit/850148f21fe387f064e9765dbc51bf8d3cc06a66, https://github.com/ONLYOFFICE/web-apps-pro/commit/685a0a42d3c670bcfd725d6538f09ef6d55d3277) --- apps/documenteditor/mobile/app/controller/Settings.js | 10 +++++----- apps/spreadsheeteditor/main/app/controller/Print.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 79dd2388d..caa69f2d0 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -64,12 +64,12 @@ define([ { caption: 'US Letter', subtitle: Common.Utils.String.format('21,59{0} x 27,94{0}', txtCm), value: [215.9, 279.4] }, { caption: 'US Legal', subtitle: Common.Utils.String.format('21,59{0} x 35,56{0}', txtCm), value: [215.9, 355.6] }, { caption: 'A4', subtitle: Common.Utils.String.format('21{0} x 29,7{0}', txtCm), value: [210, 297] }, - { caption: 'A5', subtitle: Common.Utils.String.format('14,81{0} x 20,99{0}', txtCm), value: [148.1, 209.9] }, - { caption: 'B5', subtitle: Common.Utils.String.format('17,6{0} x 25,01{0}', txtCm), value: [176, 250.1] }, + { caption: 'A5', subtitle: Common.Utils.String.format('14,8{0} x 21{0}', txtCm), value: [148, 210] }, + { caption: 'B5', subtitle: Common.Utils.String.format('17,6{0} x 25{0}', txtCm), value: [176, 250] }, { caption: 'Envelope #10', subtitle: Common.Utils.String.format('10,48{0} x 24,13{0}', txtCm), value: [104.8, 241.3] }, - { caption: 'Envelope DL', subtitle: Common.Utils.String.format('11,01{0} x 22,01{0}', txtCm), value: [110.1, 220.1] }, - { caption: 'Tabloid', subtitle: Common.Utils.String.format('27,94{0} x 43,17{0}', txtCm), value: [279.4, 431.7] }, - { caption: 'A3', subtitle: Common.Utils.String.format('29,7{0} x 42,01{0}', txtCm), value: [297, 420.1] }, + { caption: 'Envelope DL', subtitle: Common.Utils.String.format('11{0} x 22{0}', txtCm), value: [110, 220] }, + { caption: 'Tabloid', subtitle: Common.Utils.String.format('27,94{0} x 43,18{0}', txtCm), value: [279.4, 431.8] }, + { caption: 'A3', subtitle: Common.Utils.String.format('29,7{0} x 42{0}', txtCm), value: [297, 420] }, { caption: 'Tabloid Oversize', subtitle: Common.Utils.String.format('30,48{0} x 45,71{0}', txtCm), value: [304.8, 457.1] }, { caption: 'ROC 16K', subtitle: Common.Utils.String.format('19,68{0} x 27,3{0}', txtCm), value: [196.8, 273] }, { caption: 'Envelope Choukei 3', subtitle: Common.Utils.String.format('11,99{0} x 23,49{0}', txtCm), value: [119.9, 234.9] }, diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 1408f201d..adaa18584 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -125,7 +125,7 @@ define([ if (item) panel.cmbPaperSize.setValue(item.get('value')); else - panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h); + panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h + ')'); var fitwidth = opt.asc_getFitToWidth(), fitheight = opt.asc_getFitToHeight(); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 2b76e7666..31b9a8e72 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -264,12 +264,12 @@ define([ {value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter'}, {value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal'}, {value:'210|297', displayValue:'A4 (21cm x 29,7cm)', caption: 'A4'}, - {value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)', caption: 'A5'}, - {value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)', caption: 'B5'}, + {value:'148|210', displayValue:'A5 (14,8cm x 21cm)', caption: 'A5'}, + {value:'176|250', displayValue:'B5 (17,6cm x 25cm)', caption: 'B5'}, {value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10'}, - {value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)', caption: 'Envelope DL'}, - {value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)', caption: 'Tabloid'}, - {value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)', caption: 'A3'}, + {value:'110|220', displayValue:'Envelope DL (11cm x 22cm)', caption: 'Envelope DL'}, + {value:'279.4|431.8', displayValue:'Tabloid (27,94cm x 43,178m)', caption: 'Tabloid'}, + {value:'297|420', displayValue:'A3 (29,7cm x 42cm)', caption: 'A3'}, {value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize'}, {value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'}, {value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'},