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

fix(ToolbarToggle): restore call overlay to the timeout check

This commit is contained in:
paweldomas 2016-10-21 10:27:10 -05:00
parent 5bc727804f
commit 8c426e8bb7
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/UI/UI.js
View File

@ -1448,6 +1448,15 @@ UI.isOverlayVisible = function () {
|| GumPermissionsOverlay.isVisible(); || GumPermissionsOverlay.isVisible();
}; };
/**
* Indicates if the ring overlay is currently visible.
*
* @returns {*|boolean} {true} if the ring overlay is visible, {false} otherwise
*/
UI.isRingOverlayVisible = function () {
return RingOverlay.isVisible();
};
/** /**
* Shows browser-specific overlay with guidance how to proceed with gUM prompt. * Shows browser-specific overlay with guidance how to proceed with gUM prompt.
* @param {string} browser - name of browser for which to show the guidance * @param {string} browser - name of browser for which to show the guidance

1
modules/UI/toolbars/ToolbarToggler.js
View File

@ -36,6 +36,7 @@ function hideToolbar(force) { // eslint-disable-line no-unused-vars
if (force !== true && if (force !== true &&
(Toolbar.isHovered() (Toolbar.isHovered()
|| APP.UI.isRingOverlayVisible()
|| SideContainerToggler.isVisible())) { || SideContainerToggler.isVisible())) {
toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout); toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
} else { } else {