Merge pull request #286 from jitsi/page_reload_overlay

Page reload overlay

JitsiConference.js

@@ -562,10 +562,11 @@ JitsiConference.prototype.getRole = function () {
 
 /**
  * Check if local user is moderator.
- * @returns {boolean} true if local user is moderator, false otherwise.
+ * @returns {boolean|null} true if local user is moderator, false otherwise. If
+ * we're no longer in the conference room then <tt>null</tt> is returned.
  */
 JitsiConference.prototype.isModerator = function () {
-    return this.room.isModerator();
+    return this.room ? this.room.isModerator() : null;
 };
 
 /**
@@ -1298,10 +1299,12 @@ JitsiConference.prototype.sendApplicationLog = function(message) {
  * Checks if the user identified by given <tt>mucJid</tt> is the conference
  * focus.
  * @param mucJid the full MUC address of the user to be checked.
- * @returns {boolean} <tt>true</tt> if MUC user is the conference focus.
+ * @returns {boolean|null} <tt>true</tt> if MUC user is the conference focus,
+ * <tt>false</tt> when is not. <tt>null</tt> if we're not in the MUC anymore and
+ * are unable to figure out the status or if given <tt>mucJid</tt> is invalid.
  */
 JitsiConference.prototype._isFocus = function (mucJid) {
-    return this.room.isFocus(mucJid);
+    return this.room ? this.room.isFocus(mucJid) : null;
 };
 
 /**

modules/xmpp/ChatRoom.js

@@ -75,7 +75,7 @@ function ChatRoom(connection, jid, password, XMPP, options, settings) {
     this.joined = false;
     this.role = null;
     this.focusMucJid = null;
-    this.bridgeIsDown = false;
+    this.noBridgeAvailable = false;
     this.options = options || {};
     this.moderator = new Moderator(this.roomjid, this.xmpp, this.eventEmitter,
         settings, {connection: this.xmpp.options, conference: this.options});
@@ -366,9 +366,9 @@ ChatRoom.prototype.onPresence = function (pres) {
                     }
                 }
                 break;
-            case "bridgeIsDown":
-                if (member.isFocus && !this.bridgeIsDown) {
-                    this.bridgeIsDown = true;
+            case "bridgeNotAvailable":
+                if (member.isFocus && !this.noBridgeAvailable) {
+                    this.noBridgeAvailable = true;
                     this.eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
                 }
                 break;
@@ -669,7 +669,9 @@ ChatRoom.prototype.removePresenceListener = function (name) {
  * Checks if the user identified by given <tt>mucJid</tt> is the conference
  * focus.
  * @param mucJid the full MUC address of the user to be checked.
- * @returns {boolean} <tt>true</tt> if MUC user is the conference focus.
+ * @returns {boolean|null} <tt>true</tt> if MUC user is the conference focus or
+ * <tt>false</tt> if is not. When given <tt>mucJid</tt> does not exist in
+ * the MUC then <tt>null</tt> is returned.
  */
 ChatRoom.prototype.isFocus = function (mucJid) {
     var member = this.members[mucJid];