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

[PE] Fix bug 43820

Browse source
This commit is contained in:
Julia Svinareva 2019-12-10 13:09:52 +03:00
parent 77fa200246
commit 9eac6bf8f2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -210,7 +210,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.get_Spacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.put_Before(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
}, this)); }, this));
this.spinners.push(this.numSpacingBefore); this.spinners.push(this.numSpacingBefore);
@ -230,7 +230,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.get_Spacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.put_After(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
}, this)); }, this));
this.spinners.push(this.numSpacingAfter); this.spinners.push(this.numSpacingAfter);
@ -745,14 +745,14 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.get_Spacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.LineRule = record.value; this.Spacing.put_LineRule(record.value);
var selectItem = _.findWhere(this._arrLineRule, {value: record.value}), var selectItem = _.findWhere(this._arrLineRule, {value: record.value}),
indexSelectItem = this._arrLineRule.indexOf(selectItem); indexSelectItem = this._arrLineRule.indexOf(selectItem);
if ( this.CurLineRuleIdx !== indexSelectItem ) { if ( this.CurLineRuleIdx !== indexSelectItem ) {
this.numLineHeight.setDefaultUnit(this._arrLineRule[indexSelectItem].defaultUnit); this.numLineHeight.setDefaultUnit(this._arrLineRule[indexSelectItem].defaultUnit);
this.numLineHeight.setMinValue(this._arrLineRule[indexSelectItem].minValue); this.numLineHeight.setMinValue(this._arrLineRule[indexSelectItem].minValue);
this.numLineHeight.setStep(this._arrLineRule[indexSelectItem].step); this.numLineHeight.setStep(this._arrLineRule[indexSelectItem].step);
if (this.Spacing.LineRule === c_paragraphLinerule.LINERULE_AUTO) { if (this.Spacing.get_LineRule() === c_paragraphLinerule.LINERULE_AUTO) {
this.numLineHeight.setValue(this._arrLineRule[indexSelectItem].defaultValue); this.numLineHeight.setValue(this._arrLineRule[indexSelectItem].defaultValue);
} else { } else {
this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[indexSelectItem].defaultValue)); this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[indexSelectItem].defaultValue));
@ -768,7 +768,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.get_Spacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.put_Line((this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
}, },
textTitle: 'Paragraph - Advanced Settings', textTitle: 'Paragraph - Advanced Settings',