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

[DE] Add bullet settings

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-04 10:05:29 +03:00
parent 74724797d3
commit 408afd6f7e
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,8 @@ define([
'documenteditor/main/app/view/CustomColumnsDialog', 'documenteditor/main/app/view/CustomColumnsDialog',
'documenteditor/main/app/view/ControlSettingsDialog', 'documenteditor/main/app/view/ControlSettingsDialog',
'documenteditor/main/app/view/WatermarkSettingsDialog', 'documenteditor/main/app/view/WatermarkSettingsDialog',
'documenteditor/main/app/view/CompareSettingsDialog' 'documenteditor/main/app/view/CompareSettingsDialog',
'documenteditor/main/app/view/BulletSettingsDialog'
], function () { ], function () {
'use strict'; 'use strict';
@ -285,6 +286,7 @@ define([
toolbar.mnuMarkersPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnMarkers)); toolbar.mnuMarkersPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnMarkers));
toolbar.mnuNumbersPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnNumbers)); toolbar.mnuNumbersPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnNumbers));
toolbar.mnuMultilevelPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnMultilevels)); toolbar.mnuMultilevelPicker.on('item:click', _.bind(this.onSelectBullets, this, toolbar.btnMultilevels));
toolbar.mnuMarkerSettings.on('click', _.bind(this.onMarkerSettingsClick, this, 0));
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));
@ -1311,6 +1313,37 @@ define([
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
}, },
onMarkerSettingsClick: function(type) {
var me = this,
props;
var selectedElements = me.api.getSelectedElements();
if (selectedElements && _.isArray(selectedElements)) {
for (var i = 0; i< selectedElements.length; i++) {
if (Asc.c_oAscTypeSelectElement.Paragraph == selectedElements[i].get_ObjectType()) {
props = selectedElements[i].get_ObjectValue();
break;
}
}
}
if (props) {
(new DE.Views.BulletSettingsDialog({
api: me.api,
props: props,
type: type,
interfaceLang: me.mode.lang,
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
// me.api.paraApply(value);
}
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
}
},
onLineSpaceToggle: function(menu, item, state, e) { onLineSpaceToggle: function(menu, item, state, e) {
if (!!state) { if (!!state) {
this._state.linespace = undefined; this._state.linespace = undefined;

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

@ -1605,7 +1605,12 @@ define([
new Common.UI.Menu({ new Common.UI.Menu({
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 5px;"></div>')} {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 5px;"></div>')},
this.mnuMarkerSettings = new Common.UI.MenuItem({
caption: this.textBulletSettings,
// disabled: (this.mnuMarkersPicker.conf.index || 0)==0,
value: 'settings'
})
] ]
}) })
); );
@ -2286,7 +2291,8 @@ define([
capBtnInsSymbol: 'Symbol', capBtnInsSymbol: 'Symbol',
tipInsertSymbol: 'Insert symbol', tipInsertSymbol: 'Insert symbol',
mniDrawTable: 'Draw Table', mniDrawTable: 'Draw Table',
mniEraseTable: 'Erase Table' mniEraseTable: 'Erase Table',
textBulletSettings: 'Define New Bullet'
} }
})(), DE.Views.Toolbar || {})); })(), DE.Views.Toolbar || {}));
}); });