Don't add a date header in rooms without chat

auth10 · Aug 1, 2012 · dfa2fea · dfa2fea
1 parent 4045d3e
commit dfa2fea
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/JabbR/Chat.ui.js b/JabbR/Chat.ui.js
@@ -99,6 +99,14 @@
             return this.tab.hasClass('unread');
         };
 
+        this.hasMessages = function () {
+            return this.tab.data('messages');
+        };
+
+        this.updateMessages = function (value) {
+            this.tab.data('messages', value);
+        };
+
         this.getUnread = function () {
             return $tab.data('unread') || 0;
         };
@@ -1650,8 +1658,12 @@
             return $element;
         },
         appendMessage: function (newMessage, room) {
-            // Determine if we need to show a new date header
-            if (!$(newMessage).is('.date-header')) {
+            // Determine if we need to show a new date header: Two conditions
+            // for instantly skipping are if this message is a date header, or
+            // if the room only contains non-chat messages and we're adding a
+            // non-chat message.
+            var isMessage = $(newMessage).is('.message');
+            if (!$(newMessage).is('.date-header') && (isMessage || room.hasMessages())) {
                 var lastMessage = room.messages.find('li[data-timestamp]').last(),
                     lastDate = new Date(lastMessage.data('timestamp')),
                     thisDate = new Date($(newMessage).data('timestamp'));
@@ -1662,6 +1674,10 @@
                 }
             }
 
+            if (isMessage) {
+                room.updateMessages(true);
+            }
+
             $(newMessage).appendTo(room.messages);
         },
         hasFocus: function () {