Mercurial > snowl

changeset 185:4a472da3e9d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove obsolete sources menu from river view
author Myk Melez <myk@mozilla.org>
date Sun, 20 Jul 2008 21:10:09 -0700
parents e005621994a3
children b6726c6c287b
files extension/content/river.js extension/content/river.xul
diffstat 2 files changed, 1 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/extension/content/river.js	Sun Jul 20 21:03:10 2008 -0700
+++ b/extension/content/river.js	Sun Jul 20 21:10:09 2008 -0700
@@ -189,7 +189,6 @@
     this._document = this._window.document;
 
     this._collection = new SnowlCollection();
-    this._rebuildSourceMenu();
     this._updateToolbar();
     this.writeContent();
   },
@@ -246,18 +245,6 @@
       document.getElementById("filterTextbox").value = this._params.filter;
     }
 
-    if ("sourceID" in this._params) {
-      this._collection.sourceID = this._params.sourceID;
-      let menu = document.getElementById("sourceMenu");
-      let item;
-      for (let i = 0; item = menu.getItemAtIndex(i); i++) {
-        if (item.value == this._params.sourceID) {
-          menu.selectedItem = item;
-          break;
-        }
-      }
-    }
-
     if ("order" in this._params && this._params.order == "descending") {
       this._orderButton.checked = true;
       this._orderButton.image = "chrome://snowl/content/arrow-up.png";
@@ -265,39 +252,6 @@
     }
   },
 
-  _rebuildSourceMenu: function() {
-    let statementString = "SELECT name, id, humanURI FROM sources ORDER BY name";
-    let statement = SnowlDatastore.createStatement(statementString);
-
-    let sources = [];
-
-    let i = 0;
-    sources[i] = { id: null, name: "All" };
-
-    try {
-      // FIXME: instantiate SnowlSource objects here instead of generic objects.
-      while (statement.step())
-        sources[++i] = { id: statement.row.id,
-                         name: statement.row.name,
-                         humanURI: URI.get(statement.row.humanURI) };
-    }
-    finally {
-      statement.reset();
-    }
-
-    let sourceMenu = document.getElementById("sourceMenu");
-    sourceMenu.removeAllItems();
-    for each (let source in sources) {
-      let item = sourceMenu.appendItem(source.name, source.id);
-      item.className = "menuitem-iconic";
-      let uri = source.humanURI || URI.get("urn:use-default-icon");
-      let favicon = this._faviconSvc.getFaviconImageForPage(uri);
-      item.image = favicon.spec;
-    }
-
-    sourceMenu.selectedIndex = 0;
-  },
-
   onFilter: function(aEvent) {
     this._updateURI();
     this._applyFilters();
@@ -359,13 +313,6 @@
     this._updateURI();
   },
 
-  onCommandSourceMenu: function(aEvent) {
-    let sourceMenu = document.getElementById("sourceMenu");
-    this._collection.sourceID = sourceMenu.selectedItem.value;
-    this.rebuildView();
-    this._updateURI();
-  },
-
   _updateURI: function() {
     let params = [];
 
--- a/extension/content/river.xul	Sun Jul 20 21:03:10 2008 -0700
+++ b/extension/content/river.xul	Sun Jul 20 21:10:09 2008 -0700
@@ -25,13 +25,9 @@
     <vbox id="collectionsViewBox" style="width: 200px"/>
 
     <splitter/>
-  
+
     <vbox flex="1">
       <toolbar id="toolbar">
-        <menulist id="sourceMenu" oncommand="SnowlMessageView.onCommandSourceMenu(event)">
-          <menupopup id="sourcePopup"/>
-        </menulist>
-    
         <toolbarbutton id="currentButton" type="checkbox"
                     image="chrome://snowl/content/icons/newspaper.png"
                     oncommand="SnowlMessageView.onCommandCurrentButton(event)"