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

[DE] Fix Bug 40580

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-20 12:16:28 +03:00
parent f64fd741f0
commit 1d6a469960
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -5,7 +5,7 @@
<label class="input-label"><%= scope.textAlign %></label> <label class="input-label"><%= scope.textAlign %></label>
<div id="paragraphadv-spin-text-alignment"></div> <div id="paragraphadv-spin-text-alignment"></div>
</div> </div>
<div class="padding-large text-only" style="display: none; float: right;"> <div class="padding-large text-only" style="float: right;">
<label class="input-label"><%= scope.strIndentsOutlinelevel %></label> <label class="input-label"><%= scope.strIndentsOutlinelevel %></label>
<div id="paragraphadv-spin-outline-level"></div> <div id="paragraphadv-spin-outline-level"></div>
</div> </div>

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

@ -119,8 +119,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
]; ];
this._arrOutlinelevel = [{displayValue: this.textBodyText, value: -1}]; this._arrOutlinelevel = [{displayValue: this.textBodyText, value: -1}];
for (var i=1; i<10; i++) { for (var i=0; i<9; i++) {
this._arrOutlinelevel.push({displayValue: this.textLevel + ' ' + i, value: i}); this._arrOutlinelevel.push({displayValue: this.textLevel + ' ' + (i+1), value: i});
} }
this._arrTabAlign = [ this._arrTabAlign = [
@ -301,7 +301,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
style: 'width: 174px;', style: 'width: 174px;',
menuStyle : 'min-width: 174px;' menuStyle : 'min-width: 174px;'
}); });
this.cmbOutlinelevel.setValue(''); this.cmbOutlinelevel.setValue(-1);
this.cmbOutlinelevel.on('selected', _.bind(this.onOutlinelevelSelect, this)); this.cmbOutlinelevel.on('selected', _.bind(this.onOutlinelevelSelect, this));
// Line & Page Breaks // Line & Page Breaks
@ -890,6 +890,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.tabList.selectByIndex(0); this.tabList.selectByIndex(0);
} }
this.cmbOutlinelevel.setValue(props.get_OutlineLvl()!==undefined ? props.get_OutlineLvl() : -1);
this._noApply = false; this._noApply = false;
this._changedProps = new Asc.asc_CParagraphProperty(); this._changedProps = new Asc.asc_CParagraphProperty();
@ -1425,7 +1427,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
}, },
onOutlinelevelSelect: function(combo, record) { onOutlinelevelSelect: function(combo, record) {
if (this._changedProps) {
this._changedProps.put_OutlineLvl(record.value>-1 ? record.value: undefined);
}
}, },
textTitle: 'Paragraph - Advanced Settings', textTitle: 'Paragraph - Advanced Settings',
@ -1497,7 +1501,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textFirstLine: 'First line', textFirstLine: 'First line',
textHanging: 'Hanging', textHanging: 'Hanging',
textJustified: 'Justified', textJustified: 'Justified',
textBodyText: 'BodyText', textBodyText: 'Basic Text',
textLevel: 'Level', textLevel: 'Level',
strIndentsOutlinelevel: 'Outline level', strIndentsOutlinelevel: 'Outline level',
strIndent: 'Indents', strIndent: 'Indents',

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

@ -1736,7 +1736,7 @@
"DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least", "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least",
"DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple", "DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
"DE.Views.ParagraphSettingsAdvanced.textBackColor": "Background Color", "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Background Color",
"DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText", "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Basic Text",
"DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Border Color", "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Border Color",
"DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Click on diagram or use buttons to select borders and apply chosen style to them", "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Click on diagram or use buttons to select borders and apply chosen style to them",
"DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Border Size", "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Border Size",