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

Merge pull request #880 from jitsi/ring-overlay-style 

style(LargeVideo): Rename LARGE_VIDEO_AVATAR_DISPLAYED event
This commit is contained in:
yanas 2016-10-19 16:24:34 -05:00 committed by GitHub
parent d15413cd18 58a07355fb
commit 8ca0943881
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/UI/ring_overlay/RingOverlay.js
View File

@ -9,11 +9,11 @@ import UIEvents from "../../../service/UI/UIEvents";
let overlay = null;
/**
* Handler for UIEvents.LARGE_VIDEO_AVATAR_DISPLAYED event.
* Handler for UIEvents.LARGE_VIDEO_AVATAR_VISIBLE event.
* @param {boolean} shown indicates whether the avatar on the large video is
* currently displayed or not.
*/
function onAvatarDisplayed(shown) {
function onAvatarVisible(shown) {
overlay._changeBackground(shown);
}
@ -112,6 +112,9 @@ class RingOverlay {
$(`#${this._containerId}`).remove();
}
/**
* Stops the ringing and clears related timers.
*/
_stopAudio() {
if (this.interval) {
clearInterval(this.interval);
@ -144,8 +147,8 @@ export default {
}
overlay = new RingOverlay(callee, disableRingingSound);
APP.UI.addListener(UIEvents.LARGE_VIDEO_AVATAR_DISPLAYED,
onAvatarDisplayed);
APP.UI.addListener(UIEvents.LARGE_VIDEO_AVATAR_VISIBLE,
onAvatarVisible);
},
/**
@ -158,8 +161,8 @@ export default {
}
overlay.destroy();
overlay = null;
APP.UI.removeListener(UIEvents.LARGE_VIDEO_AVATAR_DISPLAYED,
onAvatarDisplayed);
APP.UI.removeListener(UIEvents.LARGE_VIDEO_AVATAR_VISIBLE,
onAvatarVisible);
return true;
},

2
modules/UI/videolayout/VideoContainer.js
View File

@ -397,7 +397,7 @@ export class VideoContainer extends LargeContainer {
this.$avatar.css("visibility", show ? "visible" : "hidden");
this.avatarDisplayed = show;
this.emitter.emit(UIEvents.LARGE_VIDEO_AVATAR_DISPLAYED, show);
this.emitter.emit(UIEvents.LARGE_VIDEO_AVATAR_VISIBLE, show);
}
/**

2
service/UI/UIEvents.js
View File

@ -118,7 +118,7 @@ export default {
/**
* Notifies that the avatar is displayed or not on the largeVideo.
*/
LARGE_VIDEO_AVATAR_DISPLAYED: "UI.large_video_avatar_displayed",
LARGE_VIDEO_AVATAR_VISIBLE: "UI.large_video_avatar_visible",
/**
* Toggling room lock