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

Bug 41351

Browse source
This commit is contained in:
Julia Radzhabova 2019-04-22 17:29:30 +03:00
parent 36e92e7810
commit 6a85389a24
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -136,6 +136,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
if (this._changedProps) { if (this._changedProps) {
this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue())); this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue()));
this._changedProps.put_ResetCrop(false);
} }
}, this)); }, this));
this.spinners.push(this.spnWidth); this.spinners.push(this.spnWidth);
@ -163,6 +164,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
if (this._changedProps) { if (this._changedProps) {
this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue()));
this._changedProps.put_ResetCrop(false);
} }
}, this)); }, this));
this.spinners.push(this.spnHeight); this.spinners.push(this.spnHeight);
@ -177,6 +179,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
if (this._changedProps) { if (this._changedProps) {
this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue())); this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue()));
this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue()));
this._changedProps.put_ResetCrop(true);
} }
}, this)); }, this));

5
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -72,6 +72,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.spinners = []; this.spinners = [];
this._nRatio = 1; this._nRatio = 1;
this._isDefaultSize = false;
this._originalProps = this.options.imageProps; this._originalProps = this.options.imageProps;
}, },
@ -100,6 +101,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
} }
this.spnHeight.setValue(h, true); this.spnHeight.setValue(h, true);
} }
this._isDefaultSize = false;
}, this)); }, this));
this.spinners.push(this.spnWidth); this.spinners.push(this.spnWidth);
@ -123,6 +125,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
} }
this.spnWidth.setValue(w, true); this.spnWidth.setValue(w, true);
} }
this._isDefaultSize = false;
}, this)); }, this));
this.spinners.push(this.spnHeight); this.spinners.push(this.spnHeight);
@ -133,6 +136,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.spnWidth.setValue(this.sizeOriginal.width, true); this.spnWidth.setValue(this.sizeOriginal.width, true);
this.spnHeight.setValue(this.sizeOriginal.height, true); this.spnHeight.setValue(this.sizeOriginal.height, true);
this._nRatio = this.sizeOriginal.width/this.sizeOriginal.height; this._nRatio = this.sizeOriginal.width/this.sizeOriginal.height;
this._isDefaultSize = true;
}, this)); }, this));
this.btnRatio = new Common.UI.Button({ this.btnRatio = new Common.UI.Button({
@ -268,6 +272,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
if (this.spnWidth.getValue()!=='') if (this.spnWidth.getValue()!=='')
properties.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); properties.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue()));
properties.asc_putLockAspect(this.btnRatio.pressed); properties.asc_putLockAspect(this.btnRatio.pressed);
properties.put_ResetCrop(this._isDefaultSize);
var Position = new Asc.CPosition(); var Position = new Asc.CPosition();
if (this.spnX.getValue() !== '') if (this.spnX.getValue() !== '')