+
diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
index 4284b50a6..f35abbd3d 100644
--- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -96,7 +96,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps);
this.isChart = this.options.isChart;
- this.CurLineRuleIdx = this._originalProps.asc_getSpacing().get_LineRule();
+ this.CurLineRuleIdx = this._originalProps.get_Spacing().get_LineRule();
this._arrLineRule = [
{displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03, step: 0.01, defaultUnit: 'cm'},
@@ -213,7 +213,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
- this.Spacing = properties.asc_getSpacing();
+ this.Spacing = properties.get_Spacing();
}
this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, this));
@@ -233,7 +233,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
- this.Spacing = properties.asc_getSpacing();
+ this.Spacing = properties.get_Spacing();
}
this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, this));
@@ -527,7 +527,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-tab'),
step: .1,
- width: 95,
+ width: 108,
defaultUnit : "cm",
value: '1.25 cm',
maxValue: 55.87,
@@ -538,7 +538,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numDefaultTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-default-tab'),
step: .1,
- width: 95,
+ width: 108,
defaultUnit : "cm",
value: '1.25 cm',
maxValue: 55.87,
@@ -558,9 +558,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
template: _.template(['
'].join('')),
itemTemplate: _.template([
'
',
- '
<%= value %>
',
- '
<%= displayTabAlign %>
',
- '
<%= displayTabLeader %>
',
+ '
<%= value %>
',
+ '
<%= displayTabAlign %>
',
+ '
<%= displayTabLeader %>
',
'
'
].join(''))
});
@@ -579,8 +579,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.cmbAlign = new Common.UI.ComboBox({
el : $('#paraadv-cmb-align'),
- style : 'width: 95px;',
- menuStyle : 'min-width: 95px;',
+ style : 'width: 108px;',
+ menuStyle : 'min-width: 108px;',
editable : false,
cls : 'input-group-nr',
data : this._arrTabAlign
@@ -589,8 +589,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.cmbLeader = new Common.UI.ComboBox({
el : $('#paraadv-cmb-leader'),
- style : 'width: 95px;',
- menuStyle : 'min-width: 95px;',
+ style : 'width: 108px;',
+ menuStyle : 'min-width: 108px;',
editable : false,
cls : 'input-group-nr',
data : this._arrTabLeader
@@ -780,27 +780,27 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numIndentsLeft.setValue(this.LeftIndent!==null ? Common.Utils.Metric.fnRecalcFromMM(this.LeftIndent) : '', true);
this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true);
- this.numSpacingBefore.setValue((props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getBefore() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getBefore()) : '', true);
- this.numSpacingAfter.setValue((props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getAfter() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getAfter()) : '', true);
+ this.numSpacingBefore.setValue((props.get_Spacing() !== null && props.get_Spacing().get_Before() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Before()) : '', true);
+ this.numSpacingAfter.setValue((props.get_Spacing() !== null && props.get_Spacing().get_After() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_After()) : '', true);
- var linerule = props.asc_getSpacing().asc_getLineRule();
+ var linerule = props.get_Spacing().get_LineRule();
this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true);
- if(props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getLine() !== null) {
- this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.asc_getSpacing().asc_getLine() : Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getLine()), true);
+ if(props.get_Spacing() !== null && props.get_Spacing().get_Line() !== null) {
+ this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.get_Spacing().get_Line() : Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Line()), true);
} else {
this.numLineHeight.setValue('', true);
}
- this.chAddInterval.setValue((props.asc_getContextualSpacing() !== null && props.asc_getContextualSpacing() !== undefined) ? props.asc_getContextualSpacing() : 'indeterminate', true);
+ this.chAddInterval.setValue((props.get_ContextualSpacing() !== null && props.get_ContextualSpacing() !== undefined) ? props.get_ContextualSpacing() : 'indeterminate', true);
if(this.CurSpecial === undefined) {
- this.CurSpecial = (props.asc_getInd().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.asc_getInd().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING);
+ this.CurSpecial = (props.get_Ind().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.get_Ind().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING);
}
this.cmbSpecial.setValue(this.CurSpecial);
this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true);
- this.cmbTextAlignment.setValue((props.asc_getJc() !== undefined && props.asc_getJc() !== null) ? props.asc_getJc() : c_paragraphTextAlignment.LEFT, true);
+ this.cmbTextAlignment.setValue((props.get_Jc() !== undefined && props.get_Jc() !== null) ? props.get_Jc() : c_paragraphTextAlignment.LEFT, 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);
@@ -887,8 +887,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
tabPos: pos,
value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(),
tabAlign: tab.get_Value(),
- tabLeader: tab.asc_getLeader(),
- displayTabLeader: this._arrKeyTabLeader[tab.asc_getLeader()],
+ tabLeader: tab.get_Leader(),
+ displayTabLeader: this._arrKeyTabLeader[tab.get_Leader()],
displayTabAlign: this._arrKeyTabAlign[tab.get_Value()]
});
arr.push(rec);
@@ -1365,7 +1365,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
onLineRuleSelect: function(combo, record) {
if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
- this.Spacing = properties.asc_getSpacing();
+ this.Spacing = properties.get_Spacing();
}
this.Spacing.LineRule = record.value;
if ( this.CurLineRuleIdx !== this.Spacing.LineRule ) {
@@ -1389,7 +1389,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
return;
if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
- this.Spacing = properties.asc_getSpacing();
+ this.Spacing = properties.get_Spacing();
}
this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
},
@@ -1438,8 +1438,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textTitle: 'Paragraph - Advanced Settings',
strIndentsFirstLine: 'First line',
- strIndentsLeftText: 'Indent Left',
- strIndentsRightText: 'Indent Right',
+ strIndentsLeftText: 'Left',
+ strIndentsRightText: 'Right',
strParagraphIndents: 'Indents & Spacing',
strParagraphPosition: 'Placement',
strParagraphFont: 'Font',
@@ -1493,9 +1493,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textLeader: 'Leader',
textNone: 'None',
strParagraphLine: 'Line & Page Breaks',
- strIndentsSpacingBefore: 'Spacing Before',
- strIndentsSpacingAfter: 'Spacing After',
- strIndentLineSpacingAt: 'At',
+ strIndentsSpacingBefore: 'Before',
+ strIndentsSpacingAfter: 'After',
strIndentsLineSpacing: 'Line Spacing',
txtAutoText: 'Auto',
textAuto: 'Multiple',
@@ -1506,13 +1505,14 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textNoneSpecial: '(none)',
textFirstLine: 'First line',
textHanging: 'Hanging',
- strIndentsSpecialBy: 'By',
textCentered: 'Centered',
textJustified: 'Justified',
textBodyText: 'BodyText',
textLevel: 'Level ',
strIndentsTextAlignment: 'Text Alignment',
- strIndentsOutlinelevel: 'Outline level'
+ strIndentsOutlinelevel: 'Outline level',
+ strIndent: 'Indents',
+ strSpacing: 'Spacing'
}, DE.Views.ParagraphSettingsAdvanced || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 65899a20d..3b0bbac7e 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1707,8 +1707,8 @@
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Indent Left",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Indent Right",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Keep with next",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings",
@@ -1756,9 +1756,8 @@
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
"DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page Breaks",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Spacing Before",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Spacing After",
- "DE.Views.ParagraphSettingsAdvanced.strIndentLineSpacingAt": "At",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
"DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
"DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
@@ -1769,13 +1768,14 @@
"DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
"DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
"DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "By",
"DE.Views.ParagraphSettingsAdvanced.textCentered": "Centered",
"DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
"DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText",
"DE.Views.ParagraphSettingsAdvanced.textLevel": "Level ",
"DE.Views.ParagraphSettingsAdvanced.strIndentsTextAlignment": "Text Alignment",
"DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level",
+ "DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
+ "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing",
"DE.Views.RightMenu.txtChartSettings": "Chart settings",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings",
"DE.Views.RightMenu.txtImageSettings": "Image settings",
diff --git a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
index 06eb74685..88d2cb31c 100644
--- a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
@@ -6,6 +6,7 @@