Bug 1051510 - Show throbbers on existing conversations already while connecting. r=clokep
authoraleth <aleth@instantbird.org>
Sat, 09 Aug 2014 20:46:29 +0200
changeset 16507 2f4be5bad7dbfe239b880e6d71f6ee089de30dc4
parent 16506 2ce83ce96e6d4f81ce79497f2555c79f13b3fcb9
child 16508 74fe45baef1e3bca2d9fe98b7d885fab829368d7
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs1051510
Bug 1051510 - Show throbbers on existing conversations already while connecting. r=clokep
chat/protocols/irc/irc.js
--- a/chat/protocols/irc/irc.js
+++ b/chat/protocols/irc/irc.js
@@ -1378,16 +1378,22 @@ ircAccount.prototype = {
 
   // The message of the day uses two fields to append messages.
   _motd: null,
   _motdTimer: null,
 
   connect: function() {
     this.reportConnecting();
 
+    // Mark existing MUCs as joining if they will be rejoined.
+    this.conversations.forEach(conversation => {
+      if (conversation.isChat && conversation.chatRoomFields)
+        conversation.joining = true;
+    });
+
     // Load preferences.
     this._port = this.getInt("port");
     this._ssl = this.getBool("ssl");
 
     // Use the display name as the user's real name.
     this._realname = this.imAccount.statusInfo.displayName;
     this._encoding = this.getString("encoding") || "UTF-8";
     this._showServerTab = this.getBool("showServerTab");