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

Update bootstrap (dropdown menu)

Browse source
This commit is contained in:
JuliaSvinareva 2020-09-03 18:43:03 +03:00
parent f328e43ca4
commit 1b2b5ff36a
26 changed files with 73 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/lib/component/Button.js
View file

@ -223,7 +223,7 @@ define([
templateBtnIcon + templateBtnIcon +
'</span>' + '</span>' +
'</button>' + '</button>' +
'<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown">' + '<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown" data-reference="parent">' +
'<span class="btn-fixflex-vcenter">' + '<span class="btn-fixflex-vcenter">' +
'<span class="caption"><%= caption %></span>' + '<span class="caption"><%= caption %></span>' +
'<i class="caret img-commonctrl"></i>' + '<i class="caret img-commonctrl"></i>' +
@ -281,7 +281,7 @@ define([
'<% applyicon() %>', '<% applyicon() %>',
'<span class="caption"><%= caption %></span>', '<span class="caption"><%= caption %></span>',
'</button>', '</button>',
'<button type="button" class="btn <%= cls %> dropdown-toggle" data-toggle="dropdown">', '<button type="button" class="btn <%= cls %> dropdown-toggle" data-toggle="dropdown" data-reference="parent">',
'<i class="caret img-commonctrl"></i>', '<i class="caret img-commonctrl"></i>',
'<span class="sr-only"></span>', '<span class="sr-only"></span>',
'</button>', '</button>',
@ -388,7 +388,7 @@ define([
if (modalParents.length > 0) { if (modalParents.length > 0) {
$(me.btnEl.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10); $(me.btnEl.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
me.btnMenuEl && me.btnMenuEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); me.btnMenuEl && $(me.btnMenuEl.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
var onModalClose = function(dlg) { var onModalClose = function(dlg) {
if (modalParents[0] !== dlg.$window[0]) return; if (modalParents[0] !== dlg.$window[0]) return;
var tip = me.btnEl.data('bs.tooltip'); var tip = me.btnEl.data('bs.tooltip');
@ -719,8 +719,8 @@ define([
}); });
if (modalParents.length > 0) { if (modalParents.length > 0) {
this.btnEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); $(this.btnEl.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
this.btnMenuEl && this.btnMenuEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); this.btnMenuEl && $(this.btnMenuEl.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
} }
if (this.disabled || !Common.Utils.isGecko) { if (this.disabled || !Common.Utils.isGecko) {

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

@ -109,7 +109,7 @@ define([
id: id, id: id,
additionalAlign: options.additionalAlign, additionalAlign: options.additionalAlign,
items: (options.additionalItems ? options.additionalItems : []).concat([ items: (options.additionalItems ? options.additionalItems : []).concat([
{ template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') }, { template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>'), clsDropdownItem: false },
{ template: _.template('<a id="' + id + '-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') } { template: _.template('<a id="' + id + '-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]) ])
}); });

10
apps/common/main/lib/component/ComboBox.js
View file

@ -43,7 +43,7 @@
* *
* <div class="input-group input-group-nr combobox" id="id-combobox"> * <div class="input-group input-group-nr combobox" id="id-combobox">
* <input type="text" class="form-control"> * <input type="text" class="form-control">
* <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> * <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret"></span></button>
* <ul class="dropdown-menu"></ul> * <ul class="dropdown-menu"></ul>
* </div> * </div>
* *
@ -92,10 +92,10 @@ define([
template: _.template([ template: _.template([
'<span class="input-group combobox <%= cls %>" id="<%= id %>" style="<%= style %>">', '<span class="input-group combobox <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control" spellcheck="false">', '<input type="text" class="form-control" spellcheck="false">',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>', '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">', '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>', '<li id="<%= item.id %>" class="dropdown-item" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>', '<% }); %>',
'</ul>', '</ul>',
'</span>' '</span>'
@ -192,7 +192,7 @@ define([
var modalParents = el.closest('.asc-window'); var modalParents = el.closest('.asc-window');
if (modalParents.length > 0) { if (modalParents.length > 0) {
el.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); $(el.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
var onModalClose = function(dlg) { var onModalClose = function(dlg) {
if (modalParents[0] !== dlg.$window[0]) return; if (modalParents[0] !== dlg.$window[0]) return;
var tip = el.data('bs.tooltip'); var tip = el.data('bs.tooltip');
@ -644,7 +644,7 @@ define([
} else { } else {
$(this.el).find('ul').html(_.template([ $(this.el).find('ul').html(_.template([
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%- item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>', '<li id="<%= item.id %>" class="dropdown-item" data-value="<%- item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>' '<% }); %>'
].join(''))({ ].join(''))({
items: this.store.toJSON(), items: this.store.toJSON(),

12
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -71,11 +71,11 @@ define([
'<div class="input-group combobox fonts <%= cls %>" id="<%= id %>" style="<%= style %>">', '<div class="input-group combobox fonts <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control" spellcheck="false"> ', '<input type="text" class="form-control" spellcheck="false"> ',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>', '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">', '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<li class="divider">', '<li class="dropdown-divider">',
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>">', '<li id="<%= item.id %>" class="dropdown-item">',
'<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>', '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
'</li>', '</li>',
'<% }); %>', '<% }); %>',
@ -204,8 +204,8 @@ define([
if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) { if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) {
_.delay(function() { _.delay(function() {
var selected = (e.keyCode == Common.UI.Keys.DOWN) ? me.cmpEl.find('ul li.selected').nextAll('li:not(.divider)') : me.cmpEl.find('ul li.selected').prevAll('li:not(.divider)'); var selected = (e.keyCode == Common.UI.Keys.DOWN) ? me.cmpEl.find('ul li.selected').nextAll('li:not(.dropdown-divider)') : me.cmpEl.find('ul li.selected').prevAll('li:not(.dropdown-divider)');
selected = (selected.length>0) ? selected.eq(0) : ((e.keyCode == Common.UI.Keys.DOWN) ? me.cmpEl.find('ul li:not(.divider):first') : me.cmpEl.find('ul li:not(.divider):last')); selected = (selected.length>0) ? selected.eq(0) : ((e.keyCode == Common.UI.Keys.DOWN) ? me.cmpEl.find('ul li:not(.dropdown-divider):first') : me.cmpEl.find('ul li:not(.dropdown-divider):last'));
selected = selected.find('a'); selected = selected.find('a');
me._skipInputChange = true; me._skipInputChange = true;
@ -379,7 +379,7 @@ define([
onInsertItem: function(item) { onInsertItem: function(item) {
$(this.el).find('ul').prepend(_.template([ $(this.el).find('ul').prepend(_.template([
'<li id="<%= item.id %>">', '<li id="<%= item.id %>" class="dropdown-item">',
'<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>', '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
'</li>' '</li>'
].join(''))({ ].join(''))({

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

@ -108,7 +108,7 @@ define([
menuAlign: 'tl-tl', menuAlign: 'tl-tl',
offset: [0, 3], offset: [0, 3],
items: [ items: [
{template: _.template('<div class="menu-picker-container"></div>')} {template: _.template('<div class="menu-picker-container"></div>'), clsDropdownItem: false}
] ]
}) })
}); });

12
apps/common/main/lib/component/InputField.js
View file

@ -169,7 +169,7 @@ define([
if (this._input.closest('.asc-window').length>0) if (this._input.closest('.asc-window').length>0)
var onModalClose = function() { var onModalClose = function() {
var errorTip = el.find('.input-error').data('bs.tooltip'); var errorTip = el.find('.input-error').data('bs.tooltip');
if (errorTip) errorTip.tip().remove(); if (errorTip) $(errorTip.getTipElement()).remove();
Common.NotificationCenter.off({'modal:close': onModalClose}); Common.NotificationCenter.off({'modal:close': onModalClose});
}; };
Common.NotificationCenter.on({'modal:close': onModalClose}); Common.NotificationCenter.on({'modal:close': onModalClose});
@ -334,7 +334,7 @@ define([
modalParents = errorBadge.closest('.asc-window'), modalParents = errorBadge.closest('.asc-window'),
errorTip = errorBadge.data('bs.tooltip'); errorTip = errorBadge.data('bs.tooltip');
if (errorTip) errorTip.tip().remove(); if (errorTip) $(errorTip.getTipElement()).remove();
errorBadge.attr('data-toggle', 'tooltip'); errorBadge.attr('data-toggle', 'tooltip');
errorBadge.removeData('bs.tooltip'); errorBadge.removeData('bs.tooltip');
errorBadge.tooltip({ errorBadge.tooltip({
@ -342,7 +342,7 @@ define([
placement : 'cursor' placement : 'cursor'
}); });
if (modalParents.length > 0) { if (modalParents.length > 0) {
errorBadge.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); $(errorBadge.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
} }
return errors; return errors;
@ -363,7 +363,7 @@ define([
modalParents = errorBadge.closest('.asc-window'), modalParents = errorBadge.closest('.asc-window'),
errorTip = errorBadge.data('bs.tooltip'); errorTip = errorBadge.data('bs.tooltip');
if (errorTip) errorTip.tip().remove(); if (errorTip) $(errorTip.getTipElement()).remove();
errorBadge.attr('data-toggle', 'tooltip'); errorBadge.attr('data-toggle', 'tooltip');
errorBadge.removeData('bs.tooltip'); errorBadge.removeData('bs.tooltip');
errorBadge.tooltip({ errorBadge.tooltip({
@ -372,7 +372,7 @@ define([
}); });
if (modalParents.length > 0) { if (modalParents.length > 0) {
errorBadge.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); $(errorBadge.data('bs.tooltip').getTipElement()).css('z-index', parseInt(modalParents.css('z-index')) + 10);
} }
} else { } else {
me.cmpEl.removeClass('error'); me.cmpEl.removeClass('error');
@ -476,7 +476,7 @@ define([
if (this._input.closest('.asc-window').length>0) if (this._input.closest('.asc-window').length>0)
var onModalClose = function() { var onModalClose = function() {
var errorTip = el.find('.input-error').data('bs.tooltip'); var errorTip = el.find('.input-error').data('bs.tooltip');
if (errorTip) errorTip.tip().remove(); if (errorTip) $(errorTip.getTipElement()).remove();
Common.NotificationCenter.off({'modal:close': onModalClose}); Common.NotificationCenter.off({'modal:close': onModalClose});
}; };
Common.NotificationCenter.on({'modal:close': onModalClose}); Common.NotificationCenter.on({'modal:close': onModalClose});

11
apps/common/main/lib/component/Menu.js
View file

@ -44,10 +44,10 @@
* Default template * Default template
* *
* <ul class="dropdown-menu" role="menu"> * <ul class="dropdown-menu" role="menu">
* <li><a href="#">item 1</a></li>--> * <li class="dropdown-item"><a href="#">item 1</a></li>-->
* <li><a href="#">item 2</a></li>--> * <li class="dropdown-item"><a href="#">item 2</a></li>-->
* <li class="divider"></li>--> * <li class="dropdown-divider"></li>-->
* <li><a href="#">item 3</a></li> * <li class="dropdown-item"><a href="#">item 3</a></li>
* </ul> * </ul>
* *
* A useful classes of menu position * A useful classes of menu position
@ -186,7 +186,8 @@ define([
me.items.push( me.items.push(
new Common.UI.MenuItem(_.extend({ new Common.UI.MenuItem(_.extend({
tagName : 'li', tagName : 'li',
template: me.itemTemplate template: me.itemTemplate,
clsDropdownItem: me.clsDropdownItem
}, item)) }, item))
); );
} }

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

@ -48,7 +48,7 @@
* <li><a href="#">Caption</a></li> * <li><a href="#">Caption</a></li>
* *
* Separator: * Separator:
* <li class="divider"></li> * <li class="dropdown-divider"></li>
* *
* Menu item with sub-menu: * Menu item with sub-menu:
* <li class="dropdown-submenu"> * <li class="dropdown-submenu">
@ -136,6 +136,7 @@ define([
this.iconCls = me.options.iconCls; this.iconCls = me.options.iconCls;
this.hint = me.options.hint; this.hint = me.options.hint;
this.rendered = false; this.rendered = false;
this.clsDropdownItem = (!_.isUndefined(me.options.clsDropdownItem)) ? me.options.clsDropdownItem : true; // false for complex elements (forms, group buttons)
if (this.menu !== null && !(this.menu instanceof Common.UI.Menu) && !(this.menu instanceof Common.UI.MenuSimple)) { if (this.menu !== null && !(this.menu instanceof Common.UI.Menu) && !(this.menu instanceof Common.UI.MenuSimple)) {
this.menu = new Common.UI.Menu(_.extend({}, me.options.menu)); this.menu = new Common.UI.Menu(_.extend({}, me.options.menu));
@ -179,7 +180,7 @@ define([
); );
} }
el.addClass('dropdown-item'); this.clsDropdownItem && el.addClass('dropdown-item');
var firstChild = el.children(':first'); var firstChild = el.children(':first');

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

@ -147,7 +147,7 @@
}, },
isVisible: function() { isVisible: function() {
return this.getBSTip().tip().is(':visible'); return $(this.getBSTip().getTipElement()).is(':visible');
} }
}); });
Common.UI = Common.UI || {}; Common.UI = Common.UI || {};

10
apps/common/main/lib/extend/Bootstrap.js
View file

@ -95,7 +95,7 @@ function patchDropDownKeyDown(e) {
} }
// var $items = $('[role=menu] li:not(.divider):visible a', $parent) - original search function // var $items = $('[role=menu] li:not(.divider):visible a', $parent) - original search function
var $items = $('> [role=menu] > li:not(.divider):not(.disabled):visible', $parent).find('> a'); var $items = $('> [role=menu] > li:not(.dropdown-divider):not(.disabled):visible', $parent).find('> a');
if (!$items.length) return; if (!$items.length) return;
@ -109,9 +109,9 @@ function patchDropDownKeyDown(e) {
li.addClass('focused-submenu'); li.addClass('focused-submenu');
_.delay(function() { _.delay(function() {
var mnu = $('> [role=menu]', li), var mnu = $('> [role=menu]', li),
$subitems = mnu.find('> li:not(.divider):not(.disabled):visible > a'), $subitems = mnu.find('> li:not(.dropdown-divider):not(.disabled):visible > a'),
$dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview'), $dataviews = mnu.find('> li:not(.dropdown-divider):not(.disabled):visible .dataview'),
$internal_menu = mnu.find('> li:not(.divider):not(.disabled):visible ul.internal-menu'); $internal_menu = mnu.find('> li:not(.dropdown-divider):not(.disabled):visible ul.internal-menu');
if ($subitems.length>0 && $dataviews.length<1 && $internal_menu.length<1) if ($subitems.length>0 && $dataviews.length<1 && $internal_menu.length<1)
($subitems.index($subitems.filter(':focus'))<0) && $subitems.eq(0).focus(); ($subitems.index($subitems.filter(':focus'))<0) && $subitems.eq(0).focus();
}, 250); }, 250);
@ -153,7 +153,7 @@ function patchDropDownKeyDownAdditional(e) { // only for formula menu when typin
return (isActive) ? $this.click() : undefined; return (isActive) ? $this.click() : undefined;
} }
var $items = $('> [role=menu] > li:not(.divider):not(.disabled):visible', $parent).find('> a'); var $items = $('> [role=menu] > li:not(.dropdown-divider):not(.disabled):visible', $parent).find('> a');
if (!$items.length) return; if (!$items.length) return;

4
apps/common/main/lib/view/Comments.js
View file

@ -371,12 +371,12 @@ define([
btns = $(view.el).find('.btn-resolve'); btns = $(view.el).find('.btn-resolve');
btns.tooltip({title: me.textResolve, placement: 'cursor'}); btns.tooltip({title: me.textResolve, placement: 'cursor'});
btns.each(function(idx, item){ btns.each(function(idx, item){
arr.push($(item).data('bs.tooltip').tip()); arr.push($($(item).data('bs.tooltip').getTipElement()));
}); });
btns = $(view.el).find('.btn-resolve-check'); btns = $(view.el).find('.btn-resolve-check');
btns.tooltip({title: me.textOpenAgain, placement: 'cursor'}); btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
btns.each(function(idx, item){ btns.each(function(idx, item){
arr.push($(item).data('bs.tooltip').tip()); arr.push($($(item).data('bs.tooltip').getTipElement()));
}); });
view.tipsArray = arr; view.tipsArray = arr;
}; };

2
apps/common/main/lib/view/History.js
View file

@ -120,7 +120,7 @@ define([
if (record.get('isRevision')) { if (record.get('isRevision')) {
if (view.btnTip) { if (view.btnTip) {
view.btnTip.dontShow = true; view.btnTip.dontShow = true;
view.btnTip.tip().remove(); $(view.btnTip.getTipElement()).remove();
view.btnTip = null; view.btnTip = null;
} }
var btns = $(view.el).find('.revision-expand').tooltip({title: (record.get('isExpanded')) ? me.textHide : me.textShow, placement: 'cursor'}); var btns = $(view.el).find('.revision-expand').tooltip({title: (record.get('isExpanded')) ? me.textHide : me.textShow, placement: 'cursor'});

2
apps/common/main/lib/view/ReviewPopover.js
View file

@ -963,7 +963,7 @@ define([
} else if (event.keyCode == Common.UI.Keys.DOWN) { } else if (event.keyCode == Common.UI.Keys.DOWN) {
if (me.emailMenu && me.emailMenu.rendered && me.emailMenu.isVisible()) { if (me.emailMenu && me.emailMenu.rendered && me.emailMenu.isVisible()) {
_.delay(function () { _.delay(function () {
var selected = me.emailMenu.cmpEl.find('li:not(.divider):first'); var selected = me.emailMenu.cmpEl.find('li:not(.dropdown-divider):first');
selected = selected.find('a'); selected = selected.find('a');
selected.focus(); selected.focus();
}, 10); }, 10);

2
apps/common/main/resources/less/combobox.less
View file

@ -115,7 +115,7 @@
} }
} }
&.divider:first-child { &.dropdown-divider:first-child {
display: none; display: none;
} }
} }

2
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -179,7 +179,7 @@ DE.ApplicationController = new(function(){
$ttEl = $('.hyperlink-tooltip'); $ttEl = $('.hyperlink-tooltip');
$ttEl.tooltip({'container':'body', 'trigger':'manual'}); $ttEl.tooltip({'container':'body', 'trigger':'manual'});
$ttEl.on('shown.bs.tooltip', function(e) { $ttEl.on('shown.bs.tooltip', function(e) {
$tooltip = $ttEl.data('bs.tooltip').tip(); $tooltip = $($ttEl.data('bs.tooltip').getTipElement());
$tooltip.css({ $tooltip.css({
left: $ttEl.ttpos[0] + ttOffset[0], left: $ttEl.ttpos[0] + ttOffset[0],

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

@ -275,7 +275,8 @@ define([
'</div>' '</div>'
].join('')), ].join('')),
stopPropagation: true, stopPropagation: true,
value: me.header.mnuZoom.options.value value: me.header.mnuZoom.options.value,
clsDropdownItem: false
}); });
me.header.btnOptions.setMenu(new Common.UI.Menu({ me.header.btnOptions.setMenu(new Common.UI.Menu({

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

@ -184,7 +184,7 @@ define([
var itemsTemplate = var itemsTemplate =
[ [
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">', '<li id="<%= item.id %>" class="dropdown-item" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
'<%= item.displayValue %><% if (item.value === Asc.c_oAscNumberingFormat.Bullet) { %><span style="font-family:<%=item.font%>;"><%=item.symbol%></span><% } %>', '<%= item.displayValue %><% if (item.value === Asc.c_oAscNumberingFormat.Bullet) { %><span style="font-family:<%=item.font%>;"><%=item.symbol%></span><% } %>',
'</a></li>', '</a></li>',
'<% }); %>' '<% }); %>'
@ -193,7 +193,7 @@ define([
'<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">', '<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>', '<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>', '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">'].concat(itemsTemplate).concat([ '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">'].concat(itemsTemplate).concat([
'</ul>', '</ul>',
'</div>' '</div>'

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

@ -242,7 +242,7 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 100px;', style: 'min-width: 100px;',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-highlight" style="width: 120px; height: 120px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-highlight" style="width: 120px; height: 120px; margin: 10px;"></div>'), clsDropdownItem: false},
{caption: '--'}, {caption: '--'},
this.mnuHighlightTransparent = new Common.UI.MenuItem({ this.mnuHighlightTransparent = new Common.UI.MenuItem({
caption: this.strMenuNoFill, caption: this.strMenuNoFill,
@ -267,7 +267,7 @@ define([
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 -7px; background-color: #000;"></span><%= caption %></a>') template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 -7px; background-color: #000;"></span><%= caption %></a>')
}, },
{caption: '--'}, {caption: '--'},
{template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>'), clsDropdownItem: false},
{template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + this.textNewColor + '</a>')} {template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + this.textNewColor + '</a>')}
] ]
}) })
@ -281,7 +281,7 @@ define([
split: true, split: true,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 169px; height: 220px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 169px; height: 220px; margin: 10px;"></div>'), clsDropdownItem: false},
{template: _.template('<a id="id-toolbar-menu-new-paracolor" style="padding-left:12px;">' + this.textNewColor + '</a>')} {template: _.template('<a id="id-toolbar-menu-new-paracolor" style="padding-left:12px;">' + this.textNewColor + '</a>')}
] ]
}) })
@ -437,7 +437,7 @@ define([
caption: me.capBtnInsTable, caption: me.capBtnInsTable,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>'), clsDropdownItem: false},
{caption: this.mniCustomTable, value: 'custom'}, {caption: this.mniCustomTable, value: 'custom'},
{caption: this.mniDrawTable, value: 'draw', checkable: true}, {caption: this.mniDrawTable, value: 'draw', checkable: true},
{caption: this.mniEraseTable, value: 'erase', checkable: true} {caption: this.mniEraseTable, value: 'erase', checkable: true}
@ -486,7 +486,7 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
cls: 'menu-shapes', cls: 'menu-shapes',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-insart" style="width: 239px; margin-left: 5px;"></div>')} {template: _.template('<div id="id-toolbar-menu-insart" style="width: 239px; margin-left: 5px;"></div>'), clsDropdownItem: false}
] ]
}) })
}); });
@ -1086,7 +1086,8 @@ define([
'<div id="id-save-style-container" class = "save-style-container">' + '<div id="id-save-style-container" class = "save-style-container">' +
'<span id="id-save-style-plus" class="plus img-commonctrl" ></span>' + '<span id="id-save-style-plus" class="plus img-commonctrl" ></span>' +
'<label id="id-save-style-link" class="save-style-link" >' + me.textStyleMenuNew + '</label>' + '<label id="id-save-style-link" class="save-style-link" >' + me.textStyleMenuNew + '</label>' +
'</div>') '</div>'),
clsDropdownItem: false
}); });
this.listStyles = new Common.UI.ComboDataView({ this.listStyles = new Common.UI.ComboDataView({
@ -1622,7 +1623,7 @@ 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 16px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 16px;"></div>'), clsDropdownItem: false},
this.mnuMarkerSettings = new Common.UI.MenuItem({ this.mnuMarkerSettings = new Common.UI.MenuItem({
caption: this.textListSettings, caption: this.textListSettings,
disabled: (this.mnuMarkersPicker.conf.index || 0)==0, disabled: (this.mnuMarkersPicker.conf.index || 0)==0,
@ -1635,7 +1636,7 @@ define([
this.btnNumbers.setMenu( this.btnNumbers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 16px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 16px;"></div>'), clsDropdownItem: false},
this.mnuNumberSettings = new Common.UI.MenuItem({ this.mnuNumberSettings = new Common.UI.MenuItem({
caption: this.textListSettings, caption: this.textListSettings,
disabled: (this.mnuNumbersPicker.conf.index || 0)==0, disabled: (this.mnuNumbersPicker.conf.index || 0)==0,
@ -1649,7 +1650,7 @@ define([
new Common.UI.Menu({ new Common.UI.Menu({
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 16px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 16px;"></div>'), clsDropdownItem: false},
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,
@ -1693,7 +1694,7 @@ define([
this.btnInsertChart.setMenu( new Common.UI.Menu({ this.btnInsertChart.setMenu( new Common.UI.Menu({
style: 'width: 364px;', style: 'width: 364px;',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-insertchart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>')} {template: _.template('<div id="id-toolbar-menu-insertchart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>'), clsDropdownItem: false}
] ]
})); }));

4
apps/documenteditor/main/resources/less/filemenu.less
View file

@ -137,7 +137,7 @@
} }
} }
&.divider { &.dropdown-divider {
height: 10px; height: 10px;
} }
} }
@ -325,7 +325,7 @@
} }
} }
&.divider { &.dropdown-divider {
height: 10px; height: 10px;
} }
} }

2
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -176,7 +176,7 @@ PE.ApplicationController = new(function(){
$ttEl = $('.hyperlink-tooltip'); $ttEl = $('.hyperlink-tooltip');
$ttEl.tooltip({'container':'body', 'trigger':'manual'}); $ttEl.tooltip({'container':'body', 'trigger':'manual'});
$ttEl.on('shown.bs.tooltip', function(e) { $ttEl.on('shown.bs.tooltip', function(e) {
$tooltip = $ttEl.data('bs.tooltip').tip(); $tooltip = $($ttEl.data('bs.tooltip').getTipElement());
$tooltip.css({ $tooltip.css({
left: $ttEl.ttpos[0] + ttOffset[0], left: $ttEl.ttpos[0] + ttOffset[0],

6
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -121,7 +121,7 @@
} }
&.devider { &.devider {
.dropdown-menu .divider; .dropdown-menu .dropdown-divider;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -203,7 +203,7 @@
} }
} }
&.divider { &.dropdown-divider {
height: 10px; height: 10px;
} }
} }
@ -388,7 +388,7 @@
} }
} }
&.divider { &.dropdown-divider {
height: 10px; height: 10px;
} }
} }

2
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -509,7 +509,7 @@ SSE.ApplicationController = new(function(){
$ttEl = $('.hyperlink-tooltip'); $ttEl = $('.hyperlink-tooltip');
$ttEl.tooltip({'container': 'body', 'trigger': 'manual'}); $ttEl.tooltip({'container': 'body', 'trigger': 'manual'});
$ttEl.on('shown.bs.tooltip', function(e) { $ttEl.on('shown.bs.tooltip', function(e) {
$tooltip = $ttEl.data('bs.tooltip').tip(); $tooltip = $($ttEl.data('bs.tooltip').getTipElement());
$tooltip.css({ $tooltip.css({
left: $ttEl.ttpos[0] + ttOffset[0], left: $ttEl.ttpos[0] + ttOffset[0],

2
apps/spreadsheeteditor/main/app/view/FormulaTab.js
View file

@ -350,7 +350,7 @@ define([
(li.length>0) && li.click(); (li.length>0) && li.click();
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
} else if (e.namespace!=="after.bs.dropdown" && (e.keyCode == Common.UI.Keys.DOWN || e.keyCode == Common.UI.Keys.UP)) { } else if (e.namespace!=="after.bs.dropdown" && (e.keyCode == Common.UI.Keys.DOWN || e.keyCode == Common.UI.Keys.UP)) {
var $items = $('> [role=menu] > li:not(.divider):not(.disabled):visible', menu.$el).find('> a'); var $items = $('> [role=menu] > li:not(.dropdown-divider):not(.disabled):visible', menu.$el).find('> a');
if (!$items.length) return; if (!$items.length) return;
var index = $items.index($items.filter(':focus')), var index = $items.index($items.filter(':focus')),
me = this; me = this;

2
apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
View file

@ -260,7 +260,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
var me = this, var me = this,
tipdata = $(evt.target).tooltip({title: this.tipIsLocked,trigger:'manual'}).data('bs.tooltip'); tipdata = $(evt.target).tooltip({title: this.tipIsLocked,trigger:'manual'}).data('bs.tooltip');
this.userTooltip = tipdata.tip(); this.userTooltip = $(tipdata.getTipElement());
this.userTooltip.css('z-index', parseInt(this.$window.css('z-index')) + 10); this.userTooltip.css('z-index', parseInt(this.$window.css('z-index')) + 10);
tipdata.show(); tipdata.show();

2
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -253,7 +253,7 @@ define([
'<div style="display: inline-block; width: 100%; max-width: 300px; overflow: hidden; text-overflow: ellipsis; text-align: right; vertical-align: bottom; padding-left: 100px; color: silver;white-space: nowrap;"><%= item.exampleval ? item.exampleval : "" %></div>', '<div style="display: inline-block; width: 100%; max-width: 300px; overflow: hidden; text-overflow: ellipsis; text-align: right; vertical-align: bottom; padding-left: 100px; color: silver;white-space: nowrap;"><%= item.exampleval ? item.exampleval : "" %></div>',
'</div></a></li>', '</div></a></li>',
'<% }); %>', '<% }); %>',
'<li class="divider">', '<li class="dropdown-divider">',
'<li id="id-toolbar-mnu-item-more-formats" data-value="-1"><a tabindex="-1" type="menuitem">' + me.textMoreFormats + '</a></li>' '<li id="id-toolbar-mnu-item-more-formats" data-value="-1"><a tabindex="-1" type="menuitem">' + me.textMoreFormats + '</a></li>'
].join('')); ].join(''));

6
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -111,7 +111,7 @@
} }
&.devider { &.devider {
.dropdown-menu .divider; .dropdown-menu .dropdown-divider;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -232,7 +232,7 @@
} }
} }
&.divider { &.dropdown-divider {
height: 10px; height: 10px;
} }
} }
@ -441,7 +441,7 @@
} }
} }
&.divider { &.dropdown-divider {
height: 10px; height: 10px;
} }
} }