Removes reload code.

JitsiConference.js

@@ -109,20 +109,6 @@ JitsiConference.prototype._init = function (options) {
     this.eventManager.setupStatisticsListeners();
 }
 
-/**
- * Reloads the conference
- * @param options {object} options to be overriden
- */
-JitsiConference.prototype._reload = function (options) {
-    var roomState = this.room.exportState();
-    if(!options)
-        options = {};
-    options.roomState = roomState;
-    this.leave(true);
-    this._init(options);
-    this.join();
-}
-
 /**
  * Joins the conference.
  * @param password {string} the password

JitsiConferenceEventManager.js

@@ -171,14 +171,13 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
     chatRoom.addListener(XMPPEvents.FOCUS_LEFT,
         function () {
             Statistics.analytics.sendEvent('conference.focusLeft');
-            if(!conference.connection._reload("focusLeft"))
-                conference.eventEmitter.emit(
-                    JitsiConferenceEvents.CONFERENCE_FAILED,
-                    JitsiConferenceErrors.FOCUS_LEFT);
+            conference.eventEmitter.emit(
+                JitsiConferenceEvents.CONFERENCE_FAILED,
+                JitsiConferenceErrors.FOCUS_LEFT);
         });
 
     var reloadHandler = function (reason) {
-        conference.connection._reload(reason);
+
     };
     chatRoom.addListener(
         XMPPEvents.ALLOCATE_FOCUS_MAX_RETRIES_ERROR,

JitsiConnection.js

@@ -18,21 +18,10 @@ function JitsiConnection(appID, token, options) {
     this.options = options;
     this.xmpp = new XMPP(options, token);
     this.conferences = {};
-    this.retryOnFail = 0;
-    this.addEventListener(JitsiConnectionEvents.CONNECTION_ESTABLISHED,
-        function () {
-            this.retryOnFail = 3;
-        }.bind(this));
 
     this.addEventListener(JitsiConnectionEvents.CONNECTION_FAILED,
         function (errType, msg) {
             Statistics.analytics.sendEvent('connection.failed.' + errType);
-            if(errType === JitsiConnectionErrors.OTHER_ERROR &&
-                (msg === "item-not-found" || msg === "host-unknown")) {
-                    var reason = "connectionError." + msg.replace(/-/g,"_");
-                    // FIXME: don't report the error if we are going to reload
-                    this._reload(reason);
-                }
         }.bind(this));
 
     this.addEventListener(JitsiConnectionEvents.CONNECTION_DISCONNECTED,
@@ -69,43 +58,6 @@ JitsiConnection.prototype.attach = function (options) {
     this.xmpp.attach(options);
 }
 
-/**
- * Reloads the JitsiConnection instance and all related conferences
- * @param reason {String} the reason for the reload.
- */
-JitsiConnection.prototype._reload = function (reason) {
-    if(this.retryOnFail === 0)
-        return false;
-    Statistics.sendReloadEvent(reason);
-    this.retryOnFail--;
-    var states = {};
-    for(var name in this.conferences) {
-        states[name] = this.conferences[name].room.exportState();
-        this.conferences[name].leave(true);
-    }
-    this.connectionEstablishedHandler =
-        this._reloadConferences.bind(this, states);
-    this.addEventListener(JitsiConnectionEvents.CONNECTION_ESTABLISHED,
-        this.connectionEstablishedHandler);
-    this.xmpp.reload();
-    return true;
-}
-
-/**
- * Reloads all conferences related to this JitsiConnection instance
- * @param states {object} the exported states per conference
- */
-JitsiConnection.prototype._reloadConferences = function (states) {
-    this.removeEventListener(JitsiConnectionEvents.CONNECTION_ESTABLISHED,
-        this.connectionEstablishedHandler);
-    this.connectionEstablishedHandler = null;
-    states = states || {};
-    for(var name in this.conferences) {
-        this.conferences[name]._init({roomState: states[name]});
-        this.conferences[name].join();
-    }
-}
-
 /**
  * Disconnect the client from the server.
  */