haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes manual triggered tooltips text and no hover.

This commit is contained in:
damencho 2017-02-17 00:14:58 +02:00
parent e599491583
commit cf69d591e4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/UI/toolbars/Toolbar.js
View File

@ -362,9 +362,8 @@ Toolbar = {
});
APP.UI.addListener(UIEvents.SHOW_CUSTOM_TOOLBAR_BUTTON_POPUP,
(toolbarButtonID, popupID, show, timeout) => {
Toolbar._showCustomToolbarPopup(
toolbarButtonID, popupID, show, timeout);
(popupID, show, timeout) => {
Toolbar._showCustomToolbarPopup(popupID, show, timeout);
});
if(!APP.tokenData.isGuest) {
@ -741,7 +740,12 @@ Toolbar = {
let gravity = 'n';
if (popup.dataAttrPosition)
gravity = popup.dataAttrPosition;
popupElement.setAttribute('data-tooltip', gravity);
// use custom attribute to save gravity option
// we use 'data-tooltip' in UIUtil to activate all tooltips
// but we want these to be manually triggered
popupElement.setAttribute('tooltip-gravity', gravity);
APP.translation.translateElement($(popupElement));
buttonElement.appendChild(popupElement);
});
@ -755,7 +759,7 @@ Toolbar = {
*/
_showCustomToolbarPopup(popupSelectorID, show, timeout) {
const gravity = $(popupSelectorID).attr('data-tooltip');
const gravity = $(popupSelectorID).attr('tooltip-gravity');
AJS.$(popupSelectorID)
.tooltip({
trigger: 'manual',