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

Merge pull request #656 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 48258
This commit is contained in:
Julia Radzhabova 2021-01-18 13:32:15 +03:00 committed by GitHub
parent 845e2a6b74 cdffc1a6e3
commit f0657548cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -394,7 +394,13 @@ define([
if (this._state.LineRuleIdx !== null) {
this.numLineHeight.setDefaultUnit(this._arrLineRule[this._state.LineRuleIdx].defaultUnit);
this.numLineHeight.setStep(this._arrLineRule[this._state.LineRuleIdx].step);
this.numLineHeight && this.numLineHeight.setValue((this._state.LineHeight !== null) ? Common.Utils.Metric.fnRecalcFromMM(this._state.LineHeight) : '', true);
var val = '';
if ( this._state.LineRuleIdx == c_paragraphLinerule.LINERULE_AUTO ) {
val = this._state.LineHeight;
} else if (this._state.LineHeight !== null ) {
val = Common.Utils.Metric.fnRecalcFromMM(this._state.LineHeight);
}
this.numLineHeight && this.numLineHeight.setValue((val !== null) ? val : '', true);
}
var val = this._state.LineSpacingBefore;

8
apps/presentationeditor/main/app/view/ParagraphSettings.js
View file

@ -246,7 +246,13 @@ define([
if (!rec) rec = this.cmbLineRule.store.at(0);
this.numLineHeight.setDefaultUnit(rec.get('defaultUnit'));
this.numLineHeight.setStep(rec.get('step'));
this.numLineHeight && this.numLineHeight.setValue((this._state.LineHeight !== null) ? Common.Utils.Metric.fnRecalcFromMM(this._state.LineHeight) : '', true);
var val = '';
if ( this._state.LineRule == c_paragraphLinerule.LINERULE_AUTO ) {
val = this._state.LineHeight;
} else if (this._state.LineHeight !== null ) {
val = Common.Utils.Metric.fnRecalcFromMM(this._state.LineHeight);
}
this.numLineHeight && this.numLineHeight.setValue((val !== null) ? val : '', true);
}
}
},

8
apps/spreadsheeteditor/main/app/view/ParagraphSettings.js
View file

@ -249,7 +249,13 @@ define([
if (!rec) rec = this.cmbLineRule.store.at(0);
this.numLineHeight.setDefaultUnit(rec.get('defaultUnit'));
this.numLineHeight.setStep(rec.get('step'));
this.numLineHeight && this.numLineHeight.setValue((this._state.LineHeight !== null) ? Common.Utils.Metric.fnRecalcFromMM(this._state.LineHeight) : '', true);
var val = '';
if ( this._state.LineRule == c_paragraphLinerule.LINERULE_AUTO ) {
val = this._state.LineHeight;
} else if (this._state.LineHeight !== null ) {
val = Common.Utils.Metric.fnRecalcFromMM(this._state.LineHeight);
}
this.numLineHeight && this.numLineHeight.setValue((val !== null) ? val : '', true);
}
}
},