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

For Bug 39134

Browse source
This commit is contained in:
Julia Radzhabova 2022-08-31 18:31:17 +03:00
parent 521f6e80e0
commit e704ee57c2
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -569,15 +569,17 @@ define([
idx = 7; idx = 7;
break; break;
} }
if ('{{DEFAULT_LANG}}' === 'ru') { if (this._state.bullets.subtype>7 && this._state.bullets.subtype<=11) {
if (this._state.bullets.subtype>7 && this._state.bullets.subtype<=11) { idx = this._state.bullets.subtype;
idx = this._state.bullets.subtype;
}
} }
this.toolbar.btnNumbers.toggle(true, true); this.toolbar.btnNumbers.toggle(true, true);
if (idx!==undefined) if (idx!==undefined) {
this.toolbar.mnuNumbersPicker.selectByIndex(idx, true); if (this.toolbar.mnuNumbersPicker.store && idx>=this.toolbar.mnuNumbersPicker.store.length)
else this.toolbar.mnuNumbersPicker.deselectAll(true);
else
this.toolbar.mnuNumbersPicker.selectByIndex(idx, true);
} else
this.toolbar.mnuNumbersPicker.deselectAll(true); this.toolbar.mnuNumbersPicker.deselectAll(true);
this.toolbar.mnuMultilevelPicker.deselectAll(true); this.toolbar.mnuMultilevelPicker.deselectAll(true);
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0); this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0);

13
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -208,14 +208,13 @@ define([
{ displayValue: 'a, b, c,...', value: Asc.c_oAscNumberingFormat.LowerLetter }, { displayValue: 'a, b, c,...', value: Asc.c_oAscNumberingFormat.LowerLetter },
{ displayValue: 'A, B, C,...', value: Asc.c_oAscNumberingFormat.UpperLetter }, { displayValue: 'A, B, C,...', value: Asc.c_oAscNumberingFormat.UpperLetter },
{ displayValue: 'i, ii, iii,...', value: Asc.c_oAscNumberingFormat.LowerRoman }, { displayValue: 'i, ii, iii,...', value: Asc.c_oAscNumberingFormat.LowerRoman },
{ displayValue: 'I, II, III,...', value: Asc.c_oAscNumberingFormat.UpperRoman } { displayValue: 'I, II, III,...', value: Asc.c_oAscNumberingFormat.UpperRoman },
{ displayValue: 'а, б, в,...', value: Asc.c_oAscNumberingFormat.RussianLower, lang: 'ru' },
{ displayValue: 'А, Б, В,...', value: Asc.c_oAscNumberingFormat.RussianUpper, lang: 'ru' }
]; ];
if ('{{DEFAULT_LANG}}' === 'ru') { items = _.reject(items, function(item){
items = items.concat([ return (item.lang!==undefined && item.lang!=='{{DEFAULT_LANG}}');
{ displayValue: 'а, б, в,...', value: Asc.c_oAscNumberingFormat.RussianLower }, });
{ displayValue: 'А, Б, В,...', value: Asc.c_oAscNumberingFormat.RussianUpper }
]);
}
this.cmbFormat = new Common.UI.ComboBoxCustom({ this.cmbFormat = new Common.UI.ComboBoxCustom({
el : $window.find('#id-dlg-numbering-format'), el : $window.find('#id-dlg-numbering-format'),
menuStyle : 'min-width: 100%;max-height: 220px;', menuStyle : 'min-width: 100%;max-height: 220px;',

17
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -2253,16 +2253,15 @@ define([
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, skipRenderOnChange: true, tip: this.tipNumNumbersPoint}, {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, skipRenderOnChange: true, tip: this.tipNumNumbersPoint},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, skipRenderOnChange: true, tip: this.tipNumNumbersParentheses}, {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, skipRenderOnChange: true, tip: this.tipNumNumbersParentheses},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true, tip: this.tipNumRoman}, {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true, tip: this.tipNumRoman},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true, tip: this.tipNumRomanSmall} {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true, tip: this.tipNumRomanSmall},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 8}, skipRenderOnChange: true, tip: this.tipRusUpperPoints, lang: 'ru'},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 9}, skipRenderOnChange: true, tip: this.tipRusUpperParentheses, lang: 'ru'},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 10}, skipRenderOnChange: true, tip: this.tipRusLowerPoints, lang: 'ru'},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 11}, skipRenderOnChange: true, tip: this.tipRusLowerParentheses, lang: 'ru'}
]; ];
if ('{{DEFAULT_LANG}}' === 'ru') { items = _.reject(items, function(item){
items = items.concat([ return (item.lang!==undefined && item.lang!=='{{DEFAULT_LANG}}');
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 8}, skipRenderOnChange: true, tip: this.tipRusUpperPoints}, });
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 9}, skipRenderOnChange: true, tip: this.tipRusUpperParentheses},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 10}, skipRenderOnChange: true, tip: this.tipRusLowerPoints},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 11}, skipRenderOnChange: true, tip: this.tipRusLowerParentheses}
]);
}
this.mnuNumbersPicker = new Common.UI.DataView({ this.mnuNumbersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-numbering'), el: $('#id-toolbar-menu-numbering'),
parentMenu: this.btnNumbers.menu, parentMenu: this.btnNumbers.menu,