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

[DE] Add changing level to multilevel list menu

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-22 12:13:54 +03:00
parent 6f853a7c1f
commit 1ab9d09675
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -301,6 +301,9 @@ define([
toolbar.mnuNumberChangeLevel && toolbar.mnuNumberChangeLevel.menu && toolbar.mnuNumberChangeLevel && toolbar.mnuNumberChangeLevel.menu &&
toolbar.mnuNumberChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 1)); toolbar.mnuNumberChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 1));
toolbar.mnuNumberChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 1)); toolbar.mnuNumberChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 1));
toolbar.mnuMultiChangeLevel && toolbar.mnuMultiChangeLevel.menu &&
toolbar.mnuMultiChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 2));
toolbar.mnuMultiChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 2));
toolbar.btnHighlightColor.on('click', _.bind(this.onBtnHighlightColor, this)); toolbar.btnHighlightColor.on('click', _.bind(this.onBtnHighlightColor, this));
toolbar.btnFontColor.on('click', _.bind(this.onBtnFontColor, this)); toolbar.btnFontColor.on('click', _.bind(this.onBtnFontColor, this));
toolbar.btnParagraphColor.on('click', _.bind(this.onBtnParagraphColor, this)); toolbar.btnParagraphColor.on('click', _.bind(this.onBtnParagraphColor, this));
@ -526,6 +529,7 @@ define([
this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0);
this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(this._state.bullets.subtype<0);
this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0);
this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(this._state.bullets.subtype<0);
break; break;
case 1: case 1:
var idx; var idx;
@ -561,6 +565,7 @@ define([
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0); this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0);
this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(idx==0); this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(idx==0);
this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0);
this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(idx==0);
break; break;
case 2: case 2:
this.toolbar.btnMultilevels.toggle(true, true); this.toolbar.btnMultilevels.toggle(true, true);
@ -1409,7 +1414,6 @@ define([
onChangeLevelShowAfter: function(type, menu) { onChangeLevelShowAfter: function(type, menu) {
var me = this; var me = this;
var listId = me.api.asc_GetCurrentNumberingId(), var listId = me.api.asc_GetCurrentNumberingId(),
level = me.api.asc_GetCurrentNumberingLvl(),
props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null; props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null;
if (props) { if (props) {
this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props); this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props);
@ -2387,6 +2391,7 @@ define([
this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true);
this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(true); this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(true);
this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(true); this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(true);
this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(true);
}, },
_getApiTextSize: function () { _getApiTextSize: function () {

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

@ -1707,6 +1707,7 @@ define([
style: 'min-width: 139px', style: 'min-width: 139px',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')},
{caption: '--'},
this.mnuMarkerChangeLevel = new Common.UI.MenuItem({ this.mnuMarkerChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel, caption: this.textChangeLevel,
style: 'padding-right:20px;', style: 'padding-right:20px;',
@ -1727,7 +1728,7 @@ define([
}) })
); );
items = [], ids = []; items = []; ids = [];
for (var i=0; i<9; i++) { for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-numbering-level-' + i); ids.push('id-toolbar-menu-numbering-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i }); items.push({template: levelTemplate, previewId: ids[i], level: i });
@ -1737,6 +1738,7 @@ define([
cls: 'shifted-left', cls: 'shifted-left',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 9px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 9px;"></div>')},
{caption: '--'},
this.mnuNumberChangeLevel = new Common.UI.MenuItem({ this.mnuNumberChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel, caption: this.textChangeLevel,
style: 'padding-right:20px;', style: 'padding-right:20px;',
@ -1756,13 +1758,29 @@ define([
] ]
}) })
); );
items = []; ids = [];
for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-multilevels-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i });
}
this.btnMultilevels.setMenu( this.btnMultilevels.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
cls: 'shifted-left', cls: 'shifted-left',
style: 'min-width: 90px', style: 'min-width: 90px',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 9px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 185px; margin: 0 9px;"></div>')},
{caption: '--'},
this.mnuMultiChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel,
style: 'padding-right:20px;',
disabled: (this.mnuMultilevelPicker.conf.index || 0)==0,
menu: new Common.UI.Menu({
cls: 'list-settings-level',
menuAlign: 'tl-tr',
items: items,
previewIds: ids
})
}),
this.mnuMultilevelSettings = new Common.UI.MenuItem({ this.mnuMultilevelSettings = new Common.UI.MenuItem({
caption: this.textListSettings, caption: this.textListSettings,
disabled: (this.mnuMultilevelPicker.conf.index || 0)==0, disabled: (this.mnuMultilevelPicker.conf.index || 0)==0,