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

Merge pull request #1326 from jitsi/fix-manual-tooltips 

Fixes manual triggered tooltips text and no hover.
This commit is contained in:
yanas 2017-02-17 09:26:58 -06:00 committed by GitHub
parent c290cf45b7 cf69d591e4
commit 348403abff
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, APP.UI.addListener(UIEvents.SHOW_CUSTOM_TOOLBAR_BUTTON_POPUP,
(toolbarButtonID, popupID, show, timeout) => { (popupID, show, timeout) => {
Toolbar._showCustomToolbarPopup( Toolbar._showCustomToolbarPopup(popupID, show, timeout);
toolbarButtonID, popupID, show, timeout);
}); });
if(!APP.tokenData.isGuest) { if(!APP.tokenData.isGuest) {
@ -741,7 +740,12 @@ Toolbar = {
let gravity = 'n'; let gravity = 'n';
if (popup.dataAttrPosition) if (popup.dataAttrPosition)
gravity = 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); buttonElement.appendChild(popupElement);
}); });
@ -755,7 +759,7 @@ Toolbar = {
*/ */
_showCustomToolbarPopup(popupSelectorID, show, timeout) { _showCustomToolbarPopup(popupSelectorID, show, timeout) {
const gravity = $(popupSelectorID).attr('data-tooltip'); const gravity = $(popupSelectorID).attr('tooltip-gravity');
AJS.$(popupSelectorID) AJS.$(popupSelectorID)
.tooltip({ .tooltip({
trigger: 'manual', trigger: 'manual',