2
0
Эх сурвалжийг харах

Merge pull request #387 from gbonvehi/fix-unload-clearSession

Fixed an error that appears when unload event is triggered
JC Brand 10 жил өмнө
parent
commit
1cf8cfc9f6
2 өөрчлөгдсөн 7 нэмэгдсэн , 3 устгасан
  1. 6 3
      converse.js
  2. 1 0
      docs/CHANGES.rst

+ 6 - 3
converse.js

@@ -569,10 +569,13 @@
         };
 
         this.clearSession = function () {
-            this.roster.browserStorage._clear();
+            if (this.roster) {
+                this.roster.browserStorage._clear();
+            }
             this.session.browserStorage._clear();
-            var controlbox = converse.chatboxes.get('controlbox');
-            controlbox.save({'connected': false});
+            if (converse.connection.connected) {
+                converse.chatboxes.get('controlbox').save({'connected': false});
+            }
         };
 
         this.setSession = function () {

+ 1 - 0
docs/CHANGES.rst

@@ -6,6 +6,7 @@ Changelog
 
 * Refactored in order to remove the strophe.roster.js dependency. [jcbrand]
 * Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
+* Bugfix. clearSessions during unload event would throw an error when not logged in. [gbonvehi]
 
 0.9.3 (2015-05-01)
 ------------------