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

Merge branch 'master' of github.com:jitsi/jitsi-meet

This commit is contained in:
hristoterezov 2016-01-29 16:07:04 -06:00
parent ffbaaa2622 04858e7f06
commit cea0916bfd
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conference.js
View File

@ -104,7 +104,7 @@ class ConferenceConnector {
this._reject(err);
}
_onConferenceFailed(err, ...params) {
console.error('CONFERENCE FAILED:', err, params);
console.error('CONFERENCE FAILED:', err, ...params);
switch (err) {
// room is locked by the password
case ConferenceErrors.PASSWORD_REQUIRED:

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

@ -86,13 +86,12 @@ if (!interfaceConfig.filmStripOnly) {
muteLinkItem.className = 'mutelink disabled';
}
var self = this;
muteLinkItem.onclick = function(){
muteLinkItem.onclick = (event) => {
if ($(this).attr('disabled')) {
event.preventDefault();
}
var isMute = !!self.isMuted;
self.emitter.emit(UIEvents.REMOTE_AUDIO_MUTED, self.id);
var isMute = !!this.isMuted;
this.emitter.emit(UIEvents.REMOTE_AUDIO_MUTED, this.id);
popupmenuElement.setAttribute('style', 'display:none;');
@ -120,8 +119,8 @@ if (!interfaceConfig.filmStripOnly) {
var ejectText = "<div style='width: 90px;margin-left: 20px;' " +
"data-i18n='videothumbnail.kick'>&nbsp;</div>";
ejectLinkItem.innerHTML = ejectIndicator + ' ' + ejectText;
ejectLinkItem.onclick = function(){
self.emitter.emit(UIEvents.USER_KICKED, self.id);
ejectLinkItem.onclick = (event) => {
this.emitter.emit(UIEvents.USER_KICKED, this.id);
popupmenuElement.setAttribute('style', 'display:none;');
};
@ -224,8 +223,12 @@ RemoteVideo.prototype.addRemoteStreamElement = function (stream) {
// Add click handler.
let onClickHandler = (event) => {
let source = event.target || event.srcElement;
// ignore click if it was done in popup menu
if ($(source).parents('.popupmenu').length === 0) {
this.VideoLayout.handleVideoThumbClicked(false, this.id);
}
// On IE we need to populate this handler on video <object>
// and it does not give event instance as an argument,