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

[DE] Bug 40580 (Paragraph - Advanced Settings) refactoring

Browse source
This commit is contained in:
Julia Svinareva 2019-07-29 16:10:49 +03:00
parent 25984a5d42
commit 34eee2f1b5
3 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,6 @@ define([
BackColor: '#000000', BackColor: '#000000',
DisabledControls: true, DisabledControls: true,
HideTextOnlySettings: false, HideTextOnlySettings: false,
PrAlign: undefined
}; };
this.spinners = []; this.spinners = [];
this.lockedControls = []; this.lockedControls = [];
@ -186,7 +185,6 @@ define([
this.api = api; this.api = api;
if (this.api) { if (this.api) {
this.api.asc_registerCallback('asc_onParaSpacingLine', _.bind(this._onLineSpacing, this)); this.api.asc_registerCallback('asc_onParaSpacingLine', _.bind(this._onLineSpacing, this));
this.api.asc_registerCallback('asc_onPrAlign', _.bind(this.onApiParagraphAlign, this));
} }
return this; return this;
}, },
@ -421,15 +419,11 @@ define([
borderProps: me.borderAdvancedProps, borderProps: me.borderAdvancedProps,
isChart: me.isChart, isChart: me.isChart,
api: me.api, api: me.api,
textAlign: me._state.PrAlign,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {
me.borderAdvancedProps = value.borderProps; me.borderAdvancedProps = value.borderProps;
me.api.paraApply(value.paragraphProps); me.api.paraApply(value.paragraphProps);
setTimeout(function () {
me.api.put_PrAlign(value.horizontalAlign);
},50);
} }
} }
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);
@ -489,12 +483,6 @@ define([
} }
}, },
onApiParagraphAlign: function(align) {
if (this._state.PrAlign !== align) {
this._state.PrAlign = align;
}
},
strParagraphSpacing: 'Paragraph Spacing', strParagraphSpacing: 'Paragraph Spacing',
strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style', strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style',
strLineHeight: 'Line Spacing', strLineHeight: 'Line Spacing',

53
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -104,9 +104,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
]; ];
this._arrSpecian = [ this._arrSpecian = [
{displayValue: this.textNoneSpecian, value: c_paragraphSpecian.NONE_SPECIAN}, {displayValue: this.textNoneSpecian, value: c_paragraphSpecian.NONE_SPECIAN, defaultValue: 0},
{displayValue: this.textFirstLine, value: c_paragraphSpecian.FIRST_LINE}, {displayValue: this.textFirstLine, value: c_paragraphSpecian.FIRST_LINE, defaultValue: 27},
{displayValue: this.textHanging, value: c_paragraphSpecian.HANGING} {displayValue: this.textHanging, value: c_paragraphSpecian.HANGING, defaultValue: 27}
]; ];
this.CurSpecian = undefined; this.CurSpecian = undefined;
@ -116,7 +116,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
{displayValue: this.textRight, value: c_paragraphTextAlignment.RIGHT}, {displayValue: this.textRight, value: c_paragraphTextAlignment.RIGHT},
{displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED} {displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED}
]; ];
this.textAlign = this.options.textAlign;
this._arrOutlinelevel = [ this._arrOutlinelevel = [
{displayValue: this.textBodyText}, {displayValue: this.textBodyText},
@ -222,7 +221,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
cls: 'input-group-nr', cls: 'input-group-nr',
editable: false, editable: false,
data: this._arrLineRule, data: this._arrLineRule,
style: 'width: 85px;' style: 'width: 85px;',
menuStyle : 'min-width: 85px;'
}); });
this.cmbLineRule.setValue(this.CurLineRuleIdx); this.cmbLineRule.setValue(this.CurLineRuleIdx);
this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this)); this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this));
@ -249,7 +249,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
cls: 'input-group-nr', cls: 'input-group-nr',
editable: false, editable: false,
data: this._arrSpecian, data: this._arrSpecian,
style: 'width: 85px;' style: 'width: 85px;',
menuStyle : 'min-width: 85px;'
}); });
this.cmbSpecian.setValue(''); this.cmbSpecian.setValue('');
this.cmbSpecian.on('selected', _.bind(this.onSpecianSelect, this)); this.cmbSpecian.on('selected', _.bind(this.onSpecianSelect, this));
@ -272,7 +273,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
cls: 'input-group-nr', cls: 'input-group-nr',
editable: false, editable: false,
data: this._arrTextAlignment, data: this._arrTextAlignment,
style: 'width: 175px;' style: 'width: 175px;',
menuStyle : 'min-width: 175px;'
}); });
this.cmbTextAlignment.setValue(''); this.cmbTextAlignment.setValue('');
@ -281,7 +283,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
cls: 'input-group-nr', cls: 'input-group-nr',
editable: false, editable: false,
data: this._arrOutlinelevel, data: this._arrOutlinelevel,
style: 'width: 175px;' style: 'width: 175px;',
menuStyle : 'min-width: 175px;'
}); });
this.cmbOutlinelevel.setValue(''); this.cmbOutlinelevel.setValue('');
this.cmbOutlinelevel.on('selected', _.bind(this.onOutlinelevelSelect, this)); this.cmbOutlinelevel.on('selected', _.bind(this.onOutlinelevelSelect, this));
@ -738,8 +741,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this._changedProps.asc_putContextualSpacing(spaceBetweenPrg == 'checked'); this._changedProps.asc_putContextualSpacing(spaceBetweenPrg == 'checked');
var horizontalAlign = this.cmbTextAlignment.getValue(); var horizontalAlign = this.cmbTextAlignment.getValue();
this._changedProps.asc_putJc((horizontalAlign !== undefined && horizontalAlign !== null) ? horizontalAlign : c_paragraphTextAlignment.LEFT);
return { paragraphProps: this._changedProps, borderProps: {borderSize: this.BorderSize, borderColor: this.btnBorderColor.color}, horizontalAlign: horizontalAlign }; return { paragraphProps: this._changedProps, borderProps: {borderSize: this.BorderSize, borderColor: this.btnBorderColor.color} };
}, },
_setDefaults: function(props) { _setDefaults: function(props) {
@ -775,7 +779,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.cmbSpecian.setValue(this.CurSpecian); this.cmbSpecian.setValue(this.CurSpecian);
this.numSpecianBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true); this.numSpecianBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true);
this.cmbTextAlignment.setValue(this.textAlign !== undefined ? this.textAlign : c_paragraphTextAlignment.LEFT, true); this.cmbTextAlignment.setValue((props.asc_getJc() !== undefined && props.asc_getJc() !== null) ? props.asc_getJc() : c_paragraphTextAlignment.LEFT, true);
this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true); this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true);
this.chBreakBefore.setValue((props.get_PageBreakBefore() !== null && props.get_PageBreakBefore() !== undefined) ? props.get_PageBreakBefore() : 'indeterminate', true); this.chBreakBefore.setValue((props.get_PageBreakBefore() !== null && props.get_PageBreakBefore() !== undefined) ? props.get_PageBreakBefore() : 'indeterminate', true);
@ -1338,7 +1342,14 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numLineHeight.setDefaultUnit(this._arrLineRule[record.value].defaultUnit); this.numLineHeight.setDefaultUnit(this._arrLineRule[record.value].defaultUnit);
this.numLineHeight.setMinValue(this._arrLineRule[record.value].minValue); this.numLineHeight.setMinValue(this._arrLineRule[record.value].minValue);
this.numLineHeight.setStep(this._arrLineRule[record.value].step); this.numLineHeight.setStep(this._arrLineRule[record.value].step);
this.numLineHeight.setValue((this.Spacing.LineRule == c_paragraphLinerule.LINERULE_AUTO) ? this._arrLineRule[record.value].defaultValue : Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[record.value].defaultValue)); var value = this.numLineHeight.getNumberValue();
if (this.Spacing.LineRule === c_paragraphLinerule.LINERULE_AUTO) {
this.numLineHeight.setValue(this._arrLineRule[record.value].defaultValue);
} else if (this.CurLineRuleIdx === c_paragraphLinerule.LINERULE_AUTO) {
this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[record.value].defaultValue));
} else {
this.numLineHeight.setValue(value);
}
this.CurLineRuleIdx = record.value; this.CurLineRuleIdx = record.value;
} }
}, },
@ -1355,11 +1366,21 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
onSpecianSelect: function(combo, record) { onSpecianSelect: function(combo, record) {
this.CurSpecian = record.value; this.CurSpecian = record.value;
this.numSpecianBy.setValue(0, true); if (this.CurSpecian === c_paragraphSpecian.NONE_SPECIAN) {
this.numSpecianBy.setValue(0, true);
}
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined)
this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
this._changedProps.get_Ind().put_FirstLine(0); var value = Common.Utils.Metric.fnRecalcToMM(this.numSpecianBy.getNumberValue());
if (value === 0) {
this.numSpecianBy.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrSpecian[record.value].defaultValue));
value = this._arrSpecian[record.value].defaultValue;
}
if (this.CurSpecian === c_paragraphSpecian.HANGING) {
value = -value;
}
this._changedProps.get_Ind().put_FirstLine(value);
} }
}, },
@ -1387,8 +1408,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textTitle: 'Paragraph - Advanced Settings', textTitle: 'Paragraph - Advanced Settings',
strIndentsFirstLine: 'First line', strIndentsFirstLine: 'First line',
strIndentsLeftText: 'Indentation Left', strIndentsLeftText: 'Indent Left',
strIndentsRightText: 'Indentation Right', strIndentsRightText: 'Indent Right',
strParagraphIndents: 'Indents & Spacing', strParagraphIndents: 'Indents & Spacing',
strParagraphPosition: 'Placement', strParagraphPosition: 'Placement',
strParagraphFont: 'Font', strParagraphFont: 'Font',
@ -1451,7 +1472,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textAtLeast: 'At least', textAtLeast: 'At least',
textExact: 'Exactly', textExact: 'Exactly',
strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style', strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style',
strIndentsSpecian: 'Specian', strIndentsSpecian: 'Special',
textNoneSpecian: '(none)', textNoneSpecian: '(none)',
textFirstLine: 'First line', textFirstLine: 'First line',
textHanging: 'Hanging', textHanging: 'Hanging',

6
apps/documenteditor/main/locale/en.json
View file

@ -1706,8 +1706,8 @@
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill", "DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before", "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough", "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Indentation Left", "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Indent Left",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Indentation Right", "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Indent Right",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together", "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Keep with next", "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Keep with next",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings", "DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings",
@ -1764,7 +1764,7 @@
"DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least", "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least",
"DE.Views.ParagraphSettingsAdvanced.textExact": "Exactly", "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactly",
"DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style", "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style",
"DE.Views.ParagraphSettingsAdvanced.strIndentsSpecian": "Specian", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecian": "Special",
"DE.Views.ParagraphSettingsAdvanced.textNoneSpecian": "(none)", "DE.Views.ParagraphSettingsAdvanced.textNoneSpecian": "(none)",
"DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line", "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
"DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging", "DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",