Mercurial > snowl

changeset 213:ae78e909d31d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
get filters working with the collections sidebar driving the initial load of the collection
author Myk Melez <myk@mozilla.org>
date Mon, 28 Jul 2008 01:21:38 -0700
parents cf89d5c676c0
children 7a5ea78769bb
files extension/content/river.js
diffstat 1 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/extension/content/river.js	Mon Jul 28 00:59:13 2008 -0700
+++ b/extension/content/river.js	Mon Jul 28 01:21:38 2008 -0700
@@ -232,23 +232,18 @@
       this._params[name] = value;
     }
 
-    if ("current" in this._params) {
-      this._collection.current = true;
+    if ("current" in this._params)
       this._currentButton.checked = true;
-    }
 
     if ("body" in this._params)
       this._bodyButton.checked = true;
 
-    if ("filter" in this._params) {
-      this._collection.filter = this._params.filter;
+    if ("filter" in this._params)
       document.getElementById("filterTextbox").value = this._params.filter;
-    }
 
     if ("order" in this._params && this._params.order == "descending") {
       this._orderButton.checked = true;
       this._orderButton.image = "chrome://snowl/content/arrow-up.png";
-      this._collection.sortOrder = -1;
     }
 
     let selected = false;
@@ -274,6 +269,7 @@
     }
     if (!selected)
       SourcesView._tree.view.selection.select(0);
+
   },
 
   onFilter: function(aEvent) {
@@ -299,6 +295,7 @@
                      parameters: { filter: this._filterTextbox.value } });
 
     this._collection.filters = filters;
+
     this._collection.invalidate();
     this.rebuildView();
   },
@@ -329,7 +326,7 @@
   _updateURI: function() {
     let params = [];
 
-    if (typeof this._collection.current != "undefined" && this._collection.current)
+    if (this._currentButton.checked)
       params.push("current");
 
     if (this._bodyButton.checked)
@@ -342,8 +339,8 @@
       params.push("group=" + encodeURIComponent(this._collection.name));
     }
 
-    if (this._collection.filter)
-      params.push("filter=" + encodeURIComponent(this._collection.filter));
+    if (this._filterTextbox.value)
+      params.push("filter=" + encodeURIComponent(this._filterTextbox.value));
 
     if (this._collection.sortOrder == -1)
       params.push("order=descending");
@@ -439,6 +436,10 @@
 
   setCollection: function(collection) {
     this._collection = collection;
+    if (this._orderButton.checked)
+      this._collection.sortOrder = -1;
+    else
+      this._collection.sortOrder = 1;
     this._updateURI();
     this._applyFilters();
     // No need to rebuild the view here, as _applyFilters will do it for us.