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

[DE] Refactoring table settings.

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-06 14:45:10 +03:00
parent 4a760ce999
commit ba341f529e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -81,7 +81,9 @@ define([
CheckColBanded: false, CheckColBanded: false,
BackColor: '#000000', BackColor: '#000000',
RepeatRow: false, RepeatRow: false,
DisabledControls: false DisabledControls: false,
Width: null,
Height: null
}; };
this.spinners = []; this.spinners = [];
this.lockedControls = []; this.lockedControls = [];
@ -440,14 +442,16 @@ define([
this._originalProps.put_CellSelect(true); this._originalProps.put_CellSelect(true);
var value = props.get_ColumnWidth(); var value = props.get_ColumnWidth();
if ((this._state.Width === null || this._state.Width === undefined) || if ((this._state.Width === undefined || value === undefined)&&(this._state.Width!==value) ||
Math.abs(this._state.Width-value)>0.001) { Math.abs(this._state.Width-value)>0.001) {
this.numWidth.setValue((value !== null) ? Common.Utils.Metric.fnRecalcFromMM(value) : '', true); this.numWidth.setValue((value !== null && value !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(value) : '', true);
this._state.Width=value;
} }
value = props.get_RowHeight(); value = props.get_RowHeight();
if ((this._state.Height === null || this._state.Height === undefined) || if ((this._state.Height === undefined || value === undefined)&&(this._state.Height!==value) ||
Math.abs(this._state.Height-value)>0.001) { Math.abs(this._state.Height-value)>0.001) {
this.numHeight.setValue((value !== null) ? Common.Utils.Metric.fnRecalcFromMM(value) : '', true); this.numHeight.setValue((value !== null && value !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(value) : '', true);
this._state.Height=value;
} }
//for table-template //for table-template