diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 85bd926fc..1e8c93b6c 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -288,6 +288,7 @@ define([
toolbar.mnuMultilevelPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnMultilevels));
toolbar.mnuMarkerSettings.on('click', _.bind(this.onMarkerSettingsClick, this, 0));
toolbar.mnuNumberSettings.on('click', _.bind(this.onMarkerSettingsClick, this, 1));
+ toolbar.mnuMultilevelSettings.on('click', _.bind(this.onMarkerSettingsClick, this, 2));
toolbar.btnHighlightColor.on('click', _.bind(this.onBtnHighlightColor, this));
toolbar.btnFontColor.on('click', _.bind(this.onBtnFontColor, this));
toolbar.btnParagraphColor.on('click', _.bind(this.onBtnParagraphColor, this));
@@ -502,6 +503,7 @@ define([
this.toolbar.mnuMarkersPicker.deselectAll(true);
this.toolbar.mnuMultilevelPicker.deselectAll(true);
this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0);
+ this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0);
break;
case 1:
var idx;
@@ -538,6 +540,7 @@ define([
this.toolbar.mnuNumbersPicker.deselectAll(true);
this.toolbar.mnuMultilevelPicker.deselectAll(true);
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0);
+ this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0);
break;
case 2:
this.toolbar.btnMultilevels.toggle(true, true);
@@ -1333,7 +1336,6 @@ define([
level = me.api.asc_GetCurrentNumberingLvl(),
props = (listId !== null) ? me.api.asc_GetNumberingPr(listId).get_Lvl(level) : null;
if (props) {
- var type = props.get_Format();
(new DE.Views.ListSettingsDialog({
api: me.api,
props: props,
@@ -2217,6 +2219,7 @@ define([
this.toolbar.mnuMultilevelPicker.selectByIndex(0, true);
this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(true);
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(true);
+ this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true);
},
_getApiTextSize: function () {
diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js
index 3142f7faf..2ccfda8ee 100644
--- a/apps/documenteditor/main/app/view/ListSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js
@@ -52,7 +52,7 @@ define([
DE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
options: {
- type: Asc.c_oAscNumberingFormat.Bullet,
+ type: 0, // 0 - markers, 1 - numbers, 2 - multilevel
width: 300,
height: 334,
style: 'min-width: 240px;',
@@ -62,7 +62,7 @@ define([
},
initialize : function(options) {
- this.type = (options.type!==undefined) ? options.type : Asc.c_oAscNumberingFormat.Bullet;
+ this.type = options.type || 0;
_.extend(this.options, {
title: this.txtTitle
@@ -73,7 +73,7 @@ define([
'
',
'',
'',
- '<% if (type == Asc.c_oAscNumberingFormat.Bullet) { %>',
+ '<% if (type == 0) { %>',
'',
'',
'<% } else { %>',
@@ -96,8 +96,14 @@ define([
'',
' | ',
'
',
+ '
',
+ '',
'',
- '',
+ ' | ',
+ '',
+ '',
+ ' | ',
+ '',
'',
'',
' | ',
@@ -108,6 +114,7 @@ define([
this.props = options.props;
this.level = options.level;
+ this.api = options.api;
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
@@ -170,7 +177,7 @@ define([
this.cmbFormat = new Common.UI.ComboBox({
el : $window.find('#id-dlg-numbering-format'),
- menuStyle : 'min-width: 100%;',
+ menuStyle : 'min-width: 100%;max-height: 183px;',
editable : false,
cls : 'input-group-nr',
data : [
@@ -244,6 +251,15 @@ define([
}
}, this));
+ var levels = [];
+ for (var i=0; i<9; i++)
+ levels.push({value: i, levelProps: null});
+ this.levelsList = new Common.UI.ListView({
+ el: $('#levels-list', this.$window),
+ store: new Common.UI.DataViewStore(levels),
+ itemTemplate: _.template('<%= (value+1) %>
')
+ });
+
this.afterRender();
},
@@ -399,6 +415,7 @@ define([
textAuto: 'Auto',
textPreview: 'Preview',
txtType: 'Type',
- txtLikeText: 'Like a text'
+ txtLikeText: 'Like a text',
+ textLevel: 'Level'
}, DE.Views.ListSettingsDialog || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 7df4f2399..9ff873a48 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1635,7 +1635,12 @@ define([
new Common.UI.Menu({
style: 'min-width: 90px',
items: [
- {template: _.template('')}
+ {template: _.template('')},
+ this.mnuMultilevelSettings = new Common.UI.MenuItem({
+ caption: this.textListSettings,
+ disabled: (this.mnuMultilevelPicker.conf.index || 0)==0,
+ value: 'settings'
+ })
]
})
);