瀏覽代碼

Call `clearSession` when disconnecting

So that the chatboxes get closed/removed.

Also, don't render the login form when we're just reconnecting.
JC Brand 6 年之前
父節點
當前提交
86a0fa280b
共有 3 個文件被更改,包括 7 次插入4 次删除
  1. 4 2
      dist/converse.js
  2. 2 2
      src/converse-controlbox.js
  3. 1 0
      src/converse-core.js

+ 4 - 2
dist/converse.js

@@ -63220,10 +63220,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         view.model.set({
         view.model.set({
           'connected': false
           'connected': false
         });
         });
-        view.renderLoginPanel();
+        return view;
       };
       };
 
 
-      _converse.on('disconnected', disconnect);
+      _converse.on('disconnected', () => disconnect().renderLoginPanel());
 
 
       _converse.on('will-reconnect', disconnect);
       _converse.on('will-reconnect', disconnect);
     }
     }
@@ -63760,6 +63760,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
       _converse.tearDown();
       _converse.tearDown();
 
 
+      _converse.clearSession();
+
       _converse.emit('disconnected');
       _converse.emit('disconnected');
     };
     };
 
 

+ 2 - 2
src/converse-controlbox.js

@@ -613,9 +613,9 @@
                  */
                  */
                 const view = _converse.chatboxviews.get('controlbox');
                 const view = _converse.chatboxviews.get('controlbox');
                 view.model.set({'connected': false});
                 view.model.set({'connected': false});
-                view.renderLoginPanel();
+                return view;
             };
             };
-            _converse.on('disconnected', disconnect);
+            _converse.on('disconnected', () => disconnect().renderLoginPanel());
             _converse.on('will-reconnect', disconnect);
             _converse.on('will-reconnect', disconnect);
         }
         }
     });
     });

+ 1 - 0
src/converse-core.js

@@ -526,6 +526,7 @@
             delete _converse.connection.reconnecting;
             delete _converse.connection.reconnecting;
             _converse.connection.reset();
             _converse.connection.reset();
             _converse.tearDown();
             _converse.tearDown();
+            _converse.clearSession();
             _converse.emit('disconnected');
             _converse.emit('disconnected');
         };
         };