浏览代码

Bugfix. Login form doesn't render after logging out

when auto_reconnect = false
JC Brand 9 年之前
父节点
当前提交
cb288341fb
共有 3 个文件被更改,包括 7 次插入1 次删除
  1. 5 0
      docs/CHANGES.md
  2. 1 0
      src/converse-controlbox.js
  3. 1 1
      src/converse-core.js

+ 5 - 0
docs/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.2 (Unreleased)
+
+- Bugfix. Login form doesn't render after logging out, when `auto_reconnect = false` 
+  [jcbrand]
+
 ## 1.0.2 (2016-05-24)
 
 - Bugfix. Bind `sendPresence` to the right context. Bug that slipped in during

+ 1 - 0
src/converse-controlbox.js

@@ -57,6 +57,7 @@
                     view.$('#controlbox-tabs').empty();
                     view.renderLoginPanel();
                 }
+                return result;
             },
 
             _tearDown: function () {

+ 1 - 1
src/converse-core.js

@@ -442,7 +442,7 @@
         }, 1000);
 
         this.onDisconnected = function (condition) {
-            if (!converse.auto_reconnect) { return; }
+            if (!converse.auto_reconnect) { return 'disconnected'; }
             if (converse.disconnection_cause === Strophe.Status.CONNFAIL) {
                 converse.reconnect(condition);
                 return 'reconnecting';