changeset 321:74793fa72460

sort by both received and timestamp in the stream and river niews so messages that are received at the same time show up in the correct order chronologically by timestamp
author Myk Melez <myk@mozilla.org>
date Sun, 12 Oct 2008 21:30:14 -0700
parents b09b7f436e1a
children 3940ef5aa170
files content/river.js content/stream.js
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/content/river.js	Sun Oct 12 21:27:12 2008 -0700
+++ b/content/river.js	Sun Oct 12 21:30:14 2008 -0700
@@ -447,7 +447,7 @@
   setCollection: function(collection) {
     this._collection = collection;
     this._collection.sortOrder = -1;
-    this._collection.sortProperties = ["received"];
+    this._collection.sortProperties = ["received", "timestamp"];
     this._updateURI();
     this._applyFilters();
     // No need to rebuild the view here, as _applyFilters will do it for us.
--- a/content/stream.js	Sun Oct 12 21:27:12 2008 -0700
+++ b/content/stream.js	Sun Oct 12 21:30:14 2008 -0700
@@ -166,9 +166,7 @@
       parameters: {}
     });
 
-    // FIXME: make this both received and sent so messages received at the same
-    // time show up in the correct order.
-    this._collection.sortProperties = ["received"];
+    this._collection.sortProperties = ["received", "timestamp"];
     this._collection.sortOrder = -1;
     this._collection.sort();
     this._rebuildView();