From 312efd8e19505b92629fe477e532bc0c4cd19e99 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Mar 2016 16:27:44 +0300 Subject: [PATCH] =?UTF-8?q?[DE]=20=D0=9E=D1=82=D0=BB=D0=B0=D0=B4=D0=BA?= =?UTF-8?q?=D0=B0=20TableSettingsAdvanced=20-=20=D0=B2=D1=8B=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B8=D1=80?= =?UTF-8?q?=D0=B8=D0=BD=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/documenteditor/main/app/view/TableSettingsAdvanced.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index d58f311f5..1af2bade0 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -153,7 +153,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat if (this._changedProps) { var maxwidth = Common.Utils.Metric.fnRecalcFromMM(558); this.nfWidth.setDefaultUnit(record.value ? '%' : Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]); - this.nfWidth.setMaxValue(record.value ? parseFloat(100 * maxwidth/this.pageWidth).toFixed(2) : maxwidth); + this.nfWidth.setMaxValue(record.value ? parseFloat((100 * maxwidth/this.pageWidth).toFixed(2)) : maxwidth); this.nfWidth.setStep((record.value || Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt) ? 1 : 0.1); this.nfWidth.setValue((record.value) ? 100*this.nfWidth.getNumberValue()/this.pageWidth : this.pageWidth*this.nfWidth.getNumberValue()/100); this._changedProps.put_Width(record.value ? -this.nfWidth.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfWidth.getNumberValue())); @@ -1075,7 +1075,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.cmbUnit.setValue(TableWidth<0 ? 1 : 0); this.nfWidth.setDefaultUnit(TableWidth<0 ? '%' : Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()]); if (TableWidth<0) //% - this.nfWidth.setMaxValue(parseFloat(100 * Common.Utils.Metric.fnRecalcFromMM(558)/this.pageWidth).toFixed(2)); + this.nfWidth.setMaxValue(parseFloat((100 * Common.Utils.Metric.fnRecalcFromMM(558)/this.pageWidth).toFixed(2))); this.nfWidth.setStep((TableWidth<0 || Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt) ? 1 : 0.1); if (TableWidth !== null) this.nfWidth.setValue(TableWidth>0 ? Common.Utils.Metric.fnRecalcFromMM(TableWidth) : -TableWidth , true); @@ -1956,8 +1956,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.cm ? 0.1 : 1); } } - if (this.pageWidth) - this.pageWidth = Common.Utils.Metric.fnRecalcFromMM(this.pageWidth); + this.pageWidth = Common.Utils.Metric.fnRecalcFromMM(this.pageWidth); }, updateThemeColors: function() {