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

[SSE] Add tooltip with function description

Browse source
This commit is contained in:
Julia Radzhabova 2019-03-04 12:18:01 +03:00
parent 374b28d791
commit 1071360588
3 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,6 +135,7 @@ define([
this.toggleGroup = me.options.toggleGroup;
this.template = me.options.template || this.template;
this.iconCls = me.options.iconCls;
this.hint = me.options.hint;
this.rendered = false;
if (this.menu !== null && !(this.menu instanceof Common.UI.Menu)) {
@ -189,6 +190,14 @@ define([
}
}
if (me.options.hint) {
el.attr('data-toggle', 'tooltip');
el.tooltip({
title : me.options.hint,
placement : me.options.hintAnchor||'cursor'
});
}
if (this.disabled)
$(this.el).toggleClass('disabled', this.disabled);

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

@ -165,13 +165,25 @@ function patchDropDownKeyDownAdditional(e) { // only for formula menu when typin
if (!$items.length) return;
var index = $items.index($items.filter('.focus'));
var index = $items.index($items.filter('.focus')),
previndex = index;
if (e.keyCode == 38) { index > 0 ? index-- : ($this.hasClass('no-cyclic') ? (index = 0) : (index = $items.length - 1));} else // up
if (e.keyCode == 40) { index < $items.length - 1 ? index++ : ($this.hasClass('no-cyclic') ? (index = $items.length - 1) : (index = 0));} // down
if (!~index) index=0;
$items.removeClass('focus');
$items.eq(index).addClass('focus');
if (previndex !== index) {
var tip = $items.eq(previndex).parent().data('bs.tooltip');
if (tip) {
tip.hide();
}
tip = $items.eq(index).parent().data('bs.tooltip');
if (tip) {
tip.show();
}
}
}
function getParent($this) {

27
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1894,9 +1894,13 @@ define([
var me = this,
documentHolderView = me.documentHolder,
menu = documentHolderView.funcMenu,
menuContainer = documentHolderView.cmpEl.find('#menu-formula-selection');
menuContainer = documentHolderView.cmpEl.find('#menu-formula-selection'),
funcdesc = SSE.Views.FormulaLang.getDescription(Common.Utils.InternalSettings.get("sse-settings-func-locale"));
for (var i = 0; i < menu.items.length; i++) {
var tip = menu.items[i].cmpEl.data('bs.tooltip');
if (tip)
tip.hide();
menu.removeItem(menu.items[i]);
i--;
}
@ -1909,9 +1913,13 @@ define([
});
_.each(funcarr, function(menuItem, index) {
var type = menuItem.asc_getType(),
name = menuItem.asc_getName(),
origname = me.api.asc_getFormulaNameByLocale(name),
mnu = new Common.UI.MenuItem({
iconCls: (type==Asc.c_oAscPopUpSelectorType.Func) ? 'mnu-popup-func': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'mnu-popup-table' : 'mnu-popup-range') ,
caption: menuItem.asc_getName()
iconCls: (type==Asc.c_oAscPopUpSelectorType.Func) ? 'mnu-popup-func': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'mnu-popup-table' : 'mnu-popup-range') ,
caption: name,
hint : (funcdesc && funcdesc[origname]) ? funcdesc[origname].d : '',
hintAnchor: 'right'
}).on('click', function(item, e) {
setTimeout(function(){ me.api.asc_insertFormula(item.caption, type, false ); }, 10);
});
@ -1958,6 +1966,13 @@ define([
Common.UI.Menu.Manager.hideAll();
}
};
menu.on('hide:after', function(){
for (var i = 0; i < menu.items.length; i++) {
var tip = menu.items[i].cmpEl.data('bs.tooltip');
if (tip)
tip.hide();
}
});
menu.render(menuContainer);
menu.cmpEl.attr({tabindex: "-1"});
@ -1982,7 +1997,11 @@ define([
me.cellEditor.focus();
menu.cmpEl.toggleClass('from-cell-edit', infocus);
_.delay(function() {
menu.cmpEl.find('li:first a').addClass('focus');
var a = menu.cmpEl.find('li:first a');
a.addClass('focus');
var tip = a.parent().data('bs.tooltip');
if (tip)
tip.show();
}, 10);
if (!infocus)
_.delay(function() {