Merge pull request #145 from christianbundy/fix-upstream

Add refresh option and bump version
fraction · May 10, 2014 · e0fed6b · e0fed6b
2 parents 59cde7f + a3270e8
commit e0fed6b
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 19 deletions.
diff --git a/client/layout/sidebar/sidebar.html b/client/layout/sidebar/sidebar.html
@@ -10,20 +10,20 @@
         <i class="fa fa-sort"></i>
         <strong>NEWS </strong>
       </li>
-        <a href="/hot" class="{{activeSort 'hot'}} list-group-item"><i class="fa fa-fire"></i> Hot</a>
-        <a href="/top/week" class="{{activeSort 'top'}} list-group-item"><i class="fa fa-star"></i> Top</a>
+        <a href="/hot" class="{{activeSort 'hot'}} sort list-group-item"><i class="fa fa-fire"></i> Hot</a>
+        <a href="/top/week" class="{{activeSort 'top'}} sort list-group-item"><i class="fa fa-star"></i> Top</a>
         {{#if isSortTop}}
         <div class="indent">
-          <a class="{{activeTime 'hour'}} list-group-item" href="/{{sortType}}/hour">Hour</a>
-          <a class="{{activeTime 'day'}} list-group-item" href="/{{sortType}}/day">Day</a>
-          <a class="{{activeTime 'week'}} list-group-item" href="/{{sortType}}/week">Week</a>
-          <a class="{{activeTime 'month'}} list-group-item" href="/{{sortType}}/month">Month</a>
-          <a class="{{activeTime 'year'}} list-group-item" href="/{{sortType}}/year">Year</a>
-          <a class="{{activeTime 'ever'}} list-group-item" href="/{{sortType}}/ever">Ever</a>
+          <a class="{{activeTime 'hour'}} time list-group-item" href="/{{sortType}}/hour">Hour</a>
+          <a class="{{activeTime 'day'}} time list-group-item" href="/{{sortType}}/day">Day</a>
+          <a class="{{activeTime 'week'}} time list-group-item" href="/{{sortType}}/week">Week</a>
+          <a class="{{activeTime 'month'}} time list-group-item" href="/{{sortType}}/month">Month</a>
+          <a class="{{activeTime 'year'}} time list-group-item" href="/{{sortType}}/year">Year</a>
+          <a class="{{activeTime 'ever'}} time list-group-item" href="/{{sortType}}/ever">Ever</a>
         </div>
         {{/if}}
-          <a href="/recent" class="{{activeSort 'recent'}} list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
-        <a href="/random" class="{{activeSort 'random'}} list-group-item"><i class="fa fa-random"></i> Random</a>
+          <a href="/recent" class="{{activeSort 'recent'}} sort list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
+        <a href="/random" class="{{activeSort 'random'}} sort list-group-item"><i class="fa fa-random"></i> Random</a>
     </ul>
   </sidebar>
 </template>
diff --git a/client/layout/sidebar/sidebar.js b/client/layout/sidebar/sidebar.js
@@ -39,3 +39,14 @@ Template.sidebar.helpers({
     return '/';
   }
 });
+
+Template.sidebar.events({
+  'click .sort.active' : function (event) {
+    // don't try changing pages
+    event.preventDefault();
+    require('routes', function (Routes) {
+      // run the onAfterAction for the sort type
+      Routes[Session.get('sortType')].onAfterAction();
+    });
+  }
+});
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fraction.io",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "author": "Christian Bundy",
   "description": "Your personalized community aggregator.",
   "contributors": [

diff --git a/shared/router/lib/lib/controllers.js → shared/router/controllers.js b/shared/router/lib/lib/controllers.js → shared/router/controllers.js
diff --git a/shared/router/lib/lib/setNews.js → shared/router/lib/setNews.js b/shared/router/lib/lib/setNews.js → shared/router/lib/setNews.js
diff --git a/shared/router/lib/lib/shuffle.js → shared/router/lib/shuffle.js b/shared/router/lib/lib/shuffle.js → shared/router/lib/shuffle.js
diff --git a/shared/router/lib/lib/routes.js → shared/router/routes.js b/shared/router/lib/lib/routes.js → shared/router/routes.js
diff --git a/shared/router/lib/comments.js → shared/router/routes/comments.js b/shared/router/lib/comments.js → shared/router/routes/comments.js
diff --git a/shared/router/lib/default.js → shared/router/routes/default.js b/shared/router/lib/default.js → shared/router/routes/default.js
diff --git a/shared/router/lib/hot.js → shared/router/routes/hot.js b/shared/router/lib/hot.js → shared/router/routes/hot.js
@@ -13,12 +13,17 @@ define('routeHot', depend, function (Posts, setNews, Controllers) {
     },
     onAfterAction: function () {
       setNews('hot');
-      Session.set('posts', Posts.find({}, {
+      Session.set('findSelector', {});
+      Session.set('findOptions', {
         reactive: false,
         sort: {
           heat: -1
         }
-      }).fetch());
+      });
+      Session.set('posts', Posts.find(
+        Session.get('findSelector'),
+        Session.get('findOptions')
+      ).fetch());
     }
   };
 });
diff --git a/shared/router/lib/random.js → shared/router/routes/random.js b/shared/router/lib/random.js → shared/router/routes/random.js
@@ -13,9 +13,15 @@ define('routeRandom', depend, function (Posts, setNews, shuffle, Controllers) {
     },
     onAfterAction: function () {
       setNews('random');
-      Session.set('posts', shuffle(Posts.find({}, {
+
+      Session.set('findSelector', {});
+      Session.set('findOptions', {
         reactive: false
-      }).fetch()));
+      });
+      Session.set('posts', shuffle(Posts.find(
+        Session.get('findSelector'),
+        Session.get('findOptions')
+      ).fetch()));
     }
   };
 });
diff --git a/shared/router/lib/recent.js → shared/router/routes/recent.js b/shared/router/lib/recent.js → shared/router/routes/recent.js
@@ -12,13 +12,19 @@ define('routeRecent', depend, function (Posts, setNews, Controllers) {
       return Meteor.subscribe('recentPosts');
     },
     onAfterAction: function () {
+
       setNews('recent');
-      Session.set('posts', Posts.find({}, {
+      Session.set('findSelector', {});
+      Session.set('findOptions', {
         reactive: false,
         sort: {
           createdAt: -1
         }
-      }).fetch());
+      });
+      Session.set('posts', Posts.find(
+        Session.get('findSelector'),
+        Session.get('findOptions')
+      ).fetch());
     }
   };
 });
diff --git a/shared/router/lib/root.js → shared/router/routes/root.js b/shared/router/lib/root.js → shared/router/routes/root.js
diff --git a/shared/router/lib/top.js → shared/router/routes/top.js b/shared/router/lib/top.js → shared/router/routes/top.js
@@ -46,12 +46,19 @@ define('routeTop', depend, function (Posts, setNews, Controllers) {
 
       setNews('top');
       Session.set('sortTime', time);
-      Session.set('posts', Posts.find({}, {
+
+      Session.set('findSelector', {});
+      Session.set('findOptions', {
         reactive: false,
         sort: {
           oldPoints: -1
         }
-      }).fetch());
+      });
+      Session.set('posts', Posts.find(
+        Session.get('findSelector'),
+        Session.get('findOptions')
+      ).fetch());
+
 
       var accepted = [
         'hour',

diff --git a/shared/router/lib/user.js → shared/router/routes/user.js b/shared/router/lib/user.js → shared/router/routes/user.js