fixes #497

Signed-off-by: Valérian Saliou <valerian@valeriansaliou.name>

2 files changed, 10 insertions, 8 deletions

diff --git a/app/javascripts/groupchat.js b/app/javascripts/groupchat.js
index 79014749..98d47c56 100644
--- a/app/javascripts/groupchat.js
+++ b/app/javascripts/groupchat.js
@@ -21,7 +21,7 @@ var Groupchat = (function () {
 
 
     /* Variables */
-    var JOIN_SUGGEST = [];
+    self.join_suggest = [];
 
 
     /**
@@ -197,7 +197,9 @@ var Groupchat = (function () {
                 // Store groupchats to join?
                 if(this_sel.is('.continue')) {
                     $('#suggest .content a.one.active').each(function() {
-                        JOIN_SUGGEST.push(this_sel.attr('data-xid'));
+                        self.join_suggest.push(
+                            $(this).attr('data-xid')
+                        );
                     });
                 }
 
@@ -554,14 +556,14 @@ var Groupchat = (function () {
 
         try {
             // Nothing to join?
-            if(!JOIN_SUGGEST) {
+            if(!self.join_suggest) {
                 return;
             }
 
             // Join the chats
-            if(JOIN_SUGGEST.length) {
-                for(var g in JOIN_SUGGEST) {
-                    Chat.checkCreate(JOIN_SUGGEST[g], 'groupchat');
+            if(self.join_suggest.length) {
+                for(var g in self.join_suggest) {
+                    Chat.checkCreate(self.join_suggest[g], 'groupchat');
                 }
             }
         } catch(e) {
@@ -614,7 +616,7 @@ var Groupchat = (function () {
                 // Attach events
                 self._suggestCheckEvents();
             } else {
-                JOIN_SUGGEST = groupchat_arr;
+                self.join_suggest = groupchat_arr;
 
                 Connection.triggerConnected();
             }
diff --git a/app/javascripts/talk.js b/app/javascripts/talk.js
index 0693ef2e..c157f952 100644
--- a/app/javascripts/talk.js
+++ b/app/javascripts/talk.js
@@ -311,7 +311,7 @@ var Talk = (function () {
             Presence.first_sent = false;
             Search.search_filtered = false;
             Avatar.pending = [];
-            JOIN_SUGGEST = [];
+            Groupchat.join_suggest = [];
 
             // Kill all timers, exept the board ones
             $('*:not(#board .one-board)').stopTime();