search works, it's so nice

quartzjer · Nov 14, 2011 · be44466 · be44466
1 parent 00d52a1
commit be44466
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/megazine.sjs b/app/megazine.sjs
@@ -16,7 +16,7 @@ var App = exports.App = function App(route) {
   this.feedStore = new Cache("rss_feeds");
   route.when('/locker', {controller: NewsSources.Locker, template: "templates/basic-news.html"});
   route.when('/rss/new', {controller: RssAdder(this), template: "templates/add-rss.html"});
-  route.when('/rss/:feed', {controller: NewsSources.Locker, template: "templates/basic-news.html"});
+  route.when('/rss/:feed', {controller: NewsSources.RSS, template: "templates/basic-news.html"});
   spawn(this.run(route));
 };
 App.$inject=['$route'];

diff --git a/app/news-sources.sjs b/app/news-sources.sjs
@@ -356,7 +356,7 @@ RSS.prototype = common.mergeSettings(newsFunctions, {
   loadNewItems: function() {
     var date = new Date();
     this.about = "My Links";
-    var links = http.json('/Me/links/search', {query: {q:this.url}});
+    var links = http.json('/Me/links/search', {query: {q:this.url, limit:20}});
     links.forEach(function(link){link.id = link.link});
     return links;
   },

diff --git a/index.html b/index.html
@@ -86,8 +86,8 @@ <h3 id="unprocessedItems" style="display:none;" ng:show="news.pool.size"><div cl
 	  <a class="tab twitter active_{{news.type == 'locker'}}" href="#/locker">all</a>
       <span ng:repeat="feed in feeds">
         <!-- TODO: fix double-encoding requirement -->
-        <span class="tab rss active_{{route.current.params.feed == (feed.url | escapeURI)}}">
+        <span class="tab rss active_{{route.current.params.feed == (feed.key | escapeURI)}}">
-          <a ng:href="#/rss/{{feed.url | escapeURI | escapeURI}}">{{feed.name}}<a ng:click="removeFeed(feed)" class="delete">x</a></a>
+          <a ng:href="#/rss/{{feed.key | escapeURI | escapeURI}}">{{feed.name}}<a ng:click="removeFeed(feed)" class="delete">x</a></a>
         </span>
       </span>
       <a class="tab rss active_{{news.type == 'add-rss'}}" href="#/rss/new"><strong>+</strong></a>