Fix Bug 43469
This commit is contained in:
parent
d12a2a1f8f
commit
d08ff94cb3
|
@ -105,10 +105,10 @@ define([
|
||||||
|
|
||||||
updateMetricUnit: function() {
|
updateMetricUnit: function() {
|
||||||
var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
|
var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
|
|
||||||
value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
|
value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
},
|
},
|
||||||
|
|
||||||
createDelayedControls: function() {
|
createDelayedControls: function() {
|
||||||
|
@ -316,13 +316,13 @@ define([
|
||||||
|
|
||||||
value = props.get_Width();
|
value = props.get_Width();
|
||||||
if ( Math.abs(this._state.Width-value)>0.001 ) {
|
if ( Math.abs(this._state.Width-value)>0.001 ) {
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this._state.Width = value;
|
this._state.Width = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
value = props.get_Height();
|
value = props.get_Height();
|
||||||
if ( Math.abs(this._state.Height-value)>0.001 ) {
|
if ( Math.abs(this._state.Height-value)>0.001 ) {
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this._state.Height = value;
|
this._state.Height = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -396,8 +396,8 @@ define([
|
||||||
var w = imgsize.get_ImageWidth();
|
var w = imgsize.get_ImageWidth();
|
||||||
var h = imgsize.get_ImageHeight();
|
var h = imgsize.get_ImageHeight();
|
||||||
|
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
|
|
||||||
var properties = new Asc.asc_CImgProperty();
|
var properties = new Asc.asc_CImgProperty();
|
||||||
properties.put_Width(w);
|
properties.put_Width(w);
|
||||||
|
@ -428,8 +428,8 @@ define([
|
||||||
h = pageh;
|
h = pageh;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
|
|
||||||
var properties = new Asc.asc_CImgProperty();
|
var properties = new Asc.asc_CImgProperty();
|
||||||
properties.put_Width(w);
|
properties.put_Width(w);
|
||||||
|
|
|
@ -102,10 +102,10 @@ define([
|
||||||
|
|
||||||
updateMetricUnit: function() {
|
updateMetricUnit: function() {
|
||||||
var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
|
var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
|
|
||||||
value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
|
value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
},
|
},
|
||||||
|
|
||||||
createDelayedControls: function() {
|
createDelayedControls: function() {
|
||||||
|
@ -249,13 +249,13 @@ define([
|
||||||
|
|
||||||
var value = props.get_Width();
|
var value = props.get_Width();
|
||||||
if ( Math.abs(this._state.Width-value)>0.001 ) {
|
if ( Math.abs(this._state.Width-value)>0.001 ) {
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this._state.Width = value;
|
this._state.Width = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
value = props.get_Height();
|
value = props.get_Height();
|
||||||
if ( Math.abs(this._state.Height-value)>0.001 ) {
|
if ( Math.abs(this._state.Height-value)>0.001 ) {
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this._state.Height = value;
|
this._state.Height = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,8 +291,8 @@ define([
|
||||||
var w = imgsize.get_ImageWidth();
|
var w = imgsize.get_ImageWidth();
|
||||||
var h = imgsize.get_ImageHeight();
|
var h = imgsize.get_ImageHeight();
|
||||||
|
|
||||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||||
|
|
||||||
var properties = new Asc.asc_CImgProperty();
|
var properties = new Asc.asc_CImgProperty();
|
||||||
properties.put_Width(w);
|
properties.put_Width(w);
|
||||||
|
|
Loading…
Reference in a new issue