Bladeren bron

In embedded mode, allow fetching of rooms from sessionStorage

Otherwise we lose the MUC session upon reload.
JC Brand 7 jaren geleden
bovenliggende
commit
d8f2a1eb57
2 gewijzigde bestanden met toevoegingen van 3 en 19 verwijderingen
  1. 0 19
      src/converse-muc-embedded.js
  2. 3 0
      src/converse-muc.js

+ 0 - 19
src/converse-muc-embedded.js

@@ -23,25 +23,6 @@
             //
             // New functions which don't exist yet can also be added.
 
-            ChatBoxes: {
-                onConnected () {
-                    // Override to avoid storing or fetching chat boxes from session
-                    // storage.
-                    const { _converse } = this.__super__;
-                    this.browserStorage = new Backbone.BrowserStorage[_converse.storage](
-                        converse.env.b64_sha1(`converse.chatboxes-${_converse.bare_jid}`));
-                    this.registerMessageHandler();
-                    /* This is disabled:
-                     *
-                     * this.fetch({
-                     *      add: true,
-                     *      success: this.onChatBoxesFetched.bind(this)
-                     *  });
-                     */
-                     this.onChatBoxesFetched(new Backbone.Collection());
-                }
-            },
-
             ChatBoxViews: {
                 initialize () {
                     this.__super__.initialize.apply(this, arguments);

+ 3 - 0
src/converse-muc.js

@@ -2893,6 +2893,9 @@
                  * settings).
                  */
                 _.each(_converse.auto_join_rooms, function (room) {
+                    if (_converse.chatboxes.where({'jid': room}).length) {
+                        return;
+                    }
                     if (_.isString(room)) {
                         _converse.api.rooms.open(room);
                     } else if (_.isObject(room)) {