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

Handles graceful-shutdown focus error response.

This commit is contained in:
paweldomas 2015-02-25 16:54:17 +01:00
parent 806d4ea443
commit 5b44edb3cc
6 changed files with 17261 additions and 17233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=21"></script> <script src="libs/app.bundle.js?v=22"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=6"/> <link rel="stylesheet" href="css/font.css?v=6"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

4
lang/main.json
View File

@ -173,6 +173,8 @@
"settings2": "Participants join muted", "settings2": "Participants join muted",
"settings3": "Require nicknames<br/><br/>Set a password to lock your room:", "settings3": "Require nicknames<br/><br/>Set a password to lock your room:",
"yourPassword": "your password", "yourPassword": "your password",
"Back": "Back" "Back": "Back",
"serviceUnavailable": "Service unavailable",
"gracefulShutdown": "Our service is currently down for maintenance. Please try again later."
} }
} }

34475
libs/app.bundle.js
View File

File diff suppressed because it is too large Load Diff

8
modules/UI/UI.js
View File

@ -135,6 +135,14 @@ function registerListeners() {
APP.connectionquality.addListener(CQEvents.STOP, APP.connectionquality.addListener(CQEvents.STOP,
VideoLayout.onStatsStop); VideoLayout.onStatsStop);
APP.xmpp.addListener(XMPPEvents.DISPOSE_CONFERENCE, onDisposeConference); APP.xmpp.addListener(XMPPEvents.DISPOSE_CONFERENCE, onDisposeConference);
APP.xmpp.addListener(XMPPEvents.GRACEFUL_SHUTDOWN, function () {
messageHandler.openMessageDialog(
'dialog.serviceUnavailable', 'Service unavailable',
'dialog.gracefulShutdown',
'Our service is currently down for maintenance.' +
' Please try again later.'
);
});
APP.xmpp.addListener(XMPPEvents.KICKED, function () { APP.xmpp.addListener(XMPPEvents.KICKED, function () {
messageHandler.openMessageDialog("dialog.sessTerminated", "Session Terminated", messageHandler.openMessageDialog("dialog.sessTerminated", "Session Terminated",
"dialog.kickMessage", "Ouch! You have been kicked out of the meet!"); "dialog.kickMessage", "Ouch! You have been kicked out of the meet!");

4
modules/xmpp/moderator.js
View File

@ -275,6 +275,10 @@ var Moderator = {
console.info("Session expired! - removing"); console.info("Session expired! - removing");
localStorage.removeItem("sessionId"); localStorage.removeItem("sessionId");
} }
if ($(error).find('>error>graceful-shutdown').length) {
eventEmitter.emit(XMPPEvents.GRACEFUL_SHUTDOWN);
return;
}
// Not authorized to create new room // Not authorized to create new room
if ($(error).find('>error>not-authorized').length) { if ($(error).find('>error>not-authorized').length) {
console.warn("Unauthorized to start the conference", error); console.warn("Unauthorized to start the conference", error);

1
service/xmpp/XMPPEvents.js
View File

@ -3,6 +3,7 @@ var XMPPEvents = {
CALL_TERMINATED: "xmpp.callterminated.jingle", CALL_TERMINATED: "xmpp.callterminated.jingle",
CALL_INCOMING: "xmpp.callincoming.jingle", CALL_INCOMING: "xmpp.callincoming.jingle",
DISPOSE_CONFERENCE: "xmpp.dispoce_confernce", DISPOSE_CONFERENCE: "xmpp.dispoce_confernce",
GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown",
KICKED: "xmpp.kicked", KICKED: "xmpp.kicked",
BRIDGE_DOWN: "xmpp.bridge_down", BRIDGE_DOWN: "xmpp.bridge_down",
USER_ID_CHANGED: "xmpp.user_id_changed", USER_ID_CHANGED: "xmpp.user_id_changed",