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

[DE] Fix Bug 49695, Fix Bug 49694

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-19 19:05:34 +03:00
parent 974873a8ed
commit 784909d517
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,6 +365,13 @@ define([
var props = new Asc.asc_CParagraphProperty(); var props = new Asc.asc_CParagraphProperty();
props.put_Ind(new Asc.asc_CParagraphInd()); props.put_Ind(new Asc.asc_CParagraphInd());
props.get_Ind().put_FirstLine(specialBy); props.get_Ind().put_FirstLine(specialBy);
if (specialBy<0 || this._state.FirstLine<0) {
var left = this._state.LeftIndent;
if (left !== undefined && left !== null) {
props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left);
}
}
if (this.api) if (this.api)
this.api.paraApply(props); this.api.paraApply(props);
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
@ -379,18 +386,25 @@ define([
var props = new Asc.asc_CParagraphProperty(); var props = new Asc.asc_CParagraphProperty();
props.put_Ind(new Asc.asc_CParagraphInd()); props.put_Ind(new Asc.asc_CParagraphInd());
props.get_Ind().put_FirstLine(specialBy); props.get_Ind().put_FirstLine(specialBy);
if (specialBy<0 || this._state.FirstLine<0) {
var left = this._state.LeftIndent;
if (left !== undefined && left !== null) {
props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left);
}
}
if (this.api) if (this.api)
this.api.paraApply(props); this.api.paraApply(props);
}, },
onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){ onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){
var left = field.getNumberValue(); var left = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
if (this._state.FirstLine<0) { if (this._state.FirstLine<0) {
left = left-this._state.FirstLine; left = left-this._state.FirstLine;
} }
var props = new Asc.asc_CParagraphProperty(); var props = new Asc.asc_CParagraphProperty();
props.put_Ind(new Asc.asc_CParagraphInd()); props.put_Ind(new Asc.asc_CParagraphInd());
props.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(left)); props.get_Ind().put_Left(left);
if (this.api) if (this.api)
this.api.paraApply(props); this.api.paraApply(props);
}, },
@ -538,7 +552,10 @@ define([
for (var i=0; i<this.spinners.length; i++) { for (var i=0; i<this.spinners.length; i++) {
var spinner = this.spinners[i]; var spinner = this.spinners[i];
spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName()); spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName());
if (spinner.el.id == 'paragraphadv-spin-position' || spinner.el.id == 'paragraph-spin-spacing-before' || spinner.el.id == 'paragraph-spin-spacing-after')
spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.01); spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.01);
else
spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
} }
} }
this._arrLineRule[2].defaultUnit = this._arrLineRule[0].defaultUnit = Common.Utils.Metric.getCurrentMetricName(); this._arrLineRule[2].defaultUnit = this._arrLineRule[0].defaultUnit = Common.Utils.Metric.getCurrentMetricName();