Browse Source

`converse._tearDown` shouldn't be called from converse-controlbox.js

JC Brand 9 years ago
parent
commit
0002c0bd53
2 changed files with 1 additions and 1 deletions
  1. 0 1
      src/converse-controlbox.js
  2. 1 0
      src/converse-core.js

+ 0 - 1
src/converse-controlbox.js

@@ -51,7 +51,6 @@
             onDisconnected: function () {
             onDisconnected: function () {
                 var result = this._super.onDisconnected.apply(this, arguments);
                 var result = this._super.onDisconnected.apply(this, arguments);
                 if (result === 'disconnected') {
                 if (result === 'disconnected') {
-                    converse._tearDown();
                     var view = converse.chatboxviews.get('controlbox');
                     var view = converse.chatboxviews.get('controlbox');
                     view.model.set({connected:false});
                     view.model.set({connected:false});
                     view.$('#controlbox-tabs').empty();
                     view.$('#controlbox-tabs').empty();

+ 1 - 0
src/converse-core.js

@@ -449,6 +449,7 @@
                 converse.reconnect(condition);
                 converse.reconnect(condition);
                 return 'reconnecting';
                 return 'reconnecting';
             } else {
             } else {
+                converse._tearDown();
                 converse.emit('disconnected');
                 converse.emit('disconnected');
                 return 'disconnected';
                 return 'disconnected';
             }
             }