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

Merge pull request #1155 from jitsi/removes-click-listeners 

Removes click handlers when popup is hidden.
This commit is contained in:
yanas 2016-11-22 17:33:30 -06:00 committed by GitHub
parent 4d3ca4a85a 75b9adf01b
commit 71c27f308c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/UI/util/JitsiPopover.js
View File

@ -69,7 +69,7 @@ var JitsiPopover = (function () {
};
/**
* Hides the popover
* Hides the popover if not hovered or popover is not shown.
*/
JitsiPopover.prototype.hide = function () {
if(!this.elementIsHovered && !this.popoverIsHovered &&
@ -79,7 +79,7 @@ var JitsiPopover = (function () {
};
/**
* Hides the popover.
* Hides the popover and clears the document elements added by popover.
*/
JitsiPopover.prototype.forceHide = function () {
$(".jitsipopover").remove();

8
modules/UI/videolayout/RemoteVideo.js
View File

@ -105,6 +105,14 @@ RemoteVideo.prototype._initPopupMenu = function (popupMenuElement) {
// call the original show, passing its actual this
origShowFunc.call(this.popover);
}.bind(this);
// override popover hide method so we can cleanup click handlers
let origHideFunc = this.popover.forceHide;
this.popover.forceHide = function () {
$(document).off("click", '#mutelink_' + this.id);
$(document).off("click", '#ejectlink_' + this.id);
origHideFunc.call(this.popover);
}.bind(this);
};
/**