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

[DE] Change add style menu item

Browse source
This commit is contained in:
Julia Radzhabova 2021-09-16 12:36:12 +03:00
parent 6429da5c5a
commit b50bff460e
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/MenuItem.js
View file

@ -111,7 +111,7 @@ define([
tagName : 'li', tagName : 'li',
template: _.template([ template: _.template([
'<a id="<%= id %>" style="<%= style %>" <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; if(!_.isUndefined(options.dataHint)) { %> data-hint="<%= options.dataHint %>" <% }; if(!_.isUndefined(options.dataHintDirection)) { %> data-hint-direction="<%= options.dataHintDirection %>" <% }; if(!_.isUndefined(options.dataHintOffset)) { %> data-hint-offset="<%= options.dataHintOffset %>" <% }; %> >', '<a id="<%= id %>" style="<%= style %>" class="<%= options.cls %>" <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; if(!_.isUndefined(options.dataHint)) { %> data-hint="<%= options.dataHint %>" <% }; if(!_.isUndefined(options.dataHintDirection)) { %> data-hint-direction="<%= options.dataHintDirection %>" <% }; if(!_.isUndefined(options.dataHintOffset)) { %> data-hint-offset="<%= options.dataHintOffset %>" <% }; %> >',
'<% if (!_.isEmpty(iconCls)) { %>', '<% if (!_.isEmpty(iconCls)) { %>',
'<span class="menu-item-icon <%= iconCls %>"></span>', '<span class="menu-item-icon <%= iconCls %>"></span>',
'<% } %>', '<% } %>',

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

@ -358,7 +358,8 @@ define([
Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this)); Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this));
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this)); $('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
$('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this)); // $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this));
toolbar.listStylesAdditionalMenuItem.on('click', this.onMenuSaveStyle.bind(this));
this.onSetupCopyStyleButton(); this.onSetupCopyStyleButton();
this.onBtnChangeState('undo:disabled', toolbar.btnUndo, toolbar.btnUndo.isDisabled()); this.onBtnChangeState('undo:disabled', toolbar.btnUndo, toolbar.btnUndo.isDisabled());

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

@ -1283,11 +1283,14 @@ define([
this.paragraphControls.push(this.cmbFontName); this.paragraphControls.push(this.cmbFontName);
this.listStylesAdditionalMenuItem = new Common.UI.MenuItem({ this.listStylesAdditionalMenuItem = new Common.UI.MenuItem({
template: _.template( cls: 'save-style-container',
'<div id="id-save-style-container" class = "save-style-container">' + iconCls: 'menu__icon btn-zoomup',
'<span id="id-save-style-plus" class="plus img-commonctrl" ></span>' + caption: me.textStyleMenuNew
'<label id="id-save-style-link" class="save-style-link" >' + me.textStyleMenuNew + '</label>' + // template: _.template(
'</div>') // '<div id="id-save-style-container" class = "save-style-container">' +
// '<span id="id-save-style-plus" class="plus img-commonctrl" ></span>' +
// '<label id="id-save-style-link" class="save-style-link" >' + me.textStyleMenuNew + '</label>' +
// '</div>')
}); });
this.listStyles = new Common.UI.ComboDataView({ this.listStyles = new Common.UI.ComboDataView({

7
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -152,9 +152,10 @@
} }
.save-style-container { .save-style-container {
cursor: default; //cursor: default;
position: relative; //position: relative;
padding: 14px 11px; //padding: 14px 11px;
padding: 14px 20px !important;
border-left: @scaled-one-px-value-ie solid @border-regular-control-ie; border-left: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-left: @scaled-one-px-value solid @border-regular-control; border-left: @scaled-one-px-value solid @border-regular-control;
border-top: @scaled-one-px-value-ie solid @border-regular-control-ie; border-top: @scaled-one-px-value-ie solid @border-regular-control-ie;