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

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

This commit is contained in:
hristoterezov 2016-01-22 11:41:02 -06:00
parent 6ad9243446 03a9c8aa1c
commit 724ebdfe04
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conference.js
View File

@ -89,7 +89,7 @@ class ConferenceConnector {
room.on(ConferenceEvents.CONFERENCE_FAILED, room.on(ConferenceEvents.CONFERENCE_FAILED,
this._onConferenceFailed.bind(this)); this._onConferenceFailed.bind(this));
} }
_handleConferenceFailed(err) { _handleConferenceFailed(err, msg) {
this._unsubscribe(); this._unsubscribe();
this._reject(err); this._reject(err);
} }
@ -108,6 +108,10 @@ class ConferenceConnector {
APP.UI.notifyConnectionFailed(msg); APP.UI.notifyConnectionFailed(msg);
break; break;
case ConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
APP.UI.notifyBridgeDown();
break;
// not enough rights to create conference // not enough rights to create conference
case ConferenceErrors.AUTHENTICATION_REQUIRED: case ConferenceErrors.AUTHENTICATION_REQUIRED:
// schedule reconnect to check if someone else created the room // schedule reconnect to check if someone else created the room
@ -120,7 +124,7 @@ class ConferenceConnector {
break; break;
default: default:
this.handleConferenceFailed(err); this._handleConferenceFailed(err, msg);
} }
} }
_unsubscribe() { _unsubscribe() {