From 6c46ebdbf799f0c8c73d5f340d91dbcbd8d898d3 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Thu, 24 Oct 2013 21:09:52 +0900 Subject: [PATCH] changed posts_best -> posts_list --- client/helpers/router.js | 12 ++++----- client/views/posts/posts_best.html | 11 -------- client/views/posts/posts_best.js | 42 ------------------------------ client/views/posts/posts_list.html | 7 ++--- client/views/posts/posts_list.js | 30 ++++++++------------- 5 files changed, 19 insertions(+), 83 deletions(-) delete mode 100644 client/views/posts/posts_best.html delete mode 100644 client/views/posts/posts_best.js diff --git a/client/helpers/router.js b/client/helpers/router.js index c45c07aa2..43f703383 100644 --- a/client/helpers/router.js +++ b/client/helpers/router.js @@ -301,7 +301,7 @@ Router.map(function() { this.route('posts_top', { path: '/', - template:'posts_best', + template:'posts_list', // waitOn: postListSubscription(selectPosts, sortPosts('baseScore'), 13), waitOn: function () { var parameters = getParameters('top', 10); @@ -322,7 +322,7 @@ Router.map(function() { this.route('posts_top', { path: '/top/:limit?', - template:'posts_best', + template:'posts_list', // waitOn: postListSubscription(selectPosts, sortPosts('baseScore'), 13), waitOn: function () { var limit = this.params.limit || getSetting('postsPerPage', 10); @@ -347,7 +347,7 @@ Router.map(function() { this.route('posts_new', { path: '/new/:limit?', - template:'posts_best', + template:'posts_list', // waitOn: postListSubscription(selectPosts, sortPosts('baseScore'), 13), waitOn: function () { var limit = this.params.limit || getSetting('postsPerPage', 10); @@ -372,7 +372,7 @@ Router.map(function() { this.route('posts_best', { path: '/best/:limit?', - template:'posts_best', + template:'posts_list', waitOn: function () { var limit = this.params.limit || getSetting('postsPerPage', 10); var parameters = getParameters('best', limit); @@ -396,7 +396,7 @@ Router.map(function() { this.route('posts_pending', { path: '/pending/:limit?', - template:'posts_best', + template:'posts_list', waitOn: function () { var limit = this.params.limit || getSetting('postsPerPage', 10); var parameters = getParameters('pending', limit); @@ -420,7 +420,7 @@ Router.map(function() { this.route('category', { path: '/category/:slug/:limit?', - template:'posts_best', + template:'posts_list', waitOn: function () { var limit = this.params.limit || getSetting('postsPerPage', 10); var parameters = getParameters('category', limit, this.params.slug); diff --git a/client/views/posts/posts_best.html b/client/views/posts/posts_best.html deleted file mode 100644 index 80c619059..000000000 --- a/client/views/posts/posts_best.html +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/client/views/posts/posts_best.js b/client/views/posts/posts_best.js deleted file mode 100644 index e8328bab9..000000000 --- a/client/views/posts/posts_best.js +++ /dev/null @@ -1,42 +0,0 @@ -Template.posts_best.helpers({ - // posts: function() { - // // console.log(Session.get('view')) - // // console.log(postsSubs[Session.get('view')]) - // var posts = Posts.find(this.find, this.options); - // return posts; - // }, - // postsReady: function() { - // return postsSubs[Session.get('view')].ready(); - // }, - allPostsLoaded: function(){ - return false; - // allPostsLoaded = postsSubs[Session.get('view')].fetch().length < postsSubs[Session.get('view')].loaded(); - // Session.set('allPostsLoaded', allPostsLoaded); - // return allPostsLoaded; - }, - loadMoreUrl: function () { - var count = parseInt(Session.get('postsLimit')) + parseInt(getSetting('postsPerPage', 10)); - var categorySegment = Session.get('categorySlug') ? Session.get('categorySlug') + '/' : ''; - return '/' + Session.get('view') + '/' + categorySegment + count; - } -}); - -Template.posts_best.rendered = function(){ - var distanceFromTop = 0; - $('.post').each(function(){ - distanceFromTop += $(this).height(); - }); - Session.set('distanceFromTop', distanceFromTop); - $('body').css('min-height',distanceFromTop+160); -} - -// Template.posts_best.events({ -// 'click .more-link': function(e) { -// e.preventDefault(); -// console.log('aaa') -// Session.set('currentScroll',$('body').scrollTop()); -// // postsSubs[Session.get('view')].loadNextPage(); -// Session.set('postsLimit', 20); -// } -// }); - diff --git a/client/views/posts/posts_list.html b/client/views/posts/posts_list.html index 3ee338cb8..a2de2f475 100644 --- a/client/views/posts/posts_list.html +++ b/client/views/posts/posts_list.html @@ -4,11 +4,8 @@ {{> post_item}} {{/each}} - {{#if postsReady}} - {{else}} -
Loading...
- {{/if}} + \ No newline at end of file diff --git a/client/views/posts/posts_list.js b/client/views/posts/posts_list.js index 9ae7f3e02..93055d703 100644 --- a/client/views/posts/posts_list.js +++ b/client/views/posts/posts_list.js @@ -1,16 +1,16 @@ Template.posts_list.helpers({ - posts: function() { - // console.log(Session.get('view')) - // console.log(postsSubs[Session.get('view')]) - return postsSubs[Session.get('view')].fetch(); - }, - postsReady: function() { - return postsSubs[Session.get('view')].ready(); - }, allPostsLoaded: function(){ - allPostsLoaded = postsSubs[Session.get('view')].fetch().length < postsSubs[Session.get('view')].loaded(); - Session.set('allPostsLoaded', allPostsLoaded); - return allPostsLoaded; + return false; + // TODO: find out when all posts have been loaded + + // allPostsLoaded = postsSubs[Session.get('view')].fetch().length < postsSubs[Session.get('view')].loaded(); + // Session.set('allPostsLoaded', allPostsLoaded); + // return allPostsLoaded; + }, + loadMoreUrl: function () { + var count = parseInt(Session.get('postsLimit')) + parseInt(getSetting('postsPerPage', 10)); + var categorySegment = Session.get('categorySlug') ? Session.get('categorySlug') + '/' : ''; + return '/' + Session.get('view') + '/' + categorySegment + count; } }); @@ -23,11 +23,3 @@ Template.posts_list.rendered = function(){ $('body').css('min-height',distanceFromTop+160); } -Template.posts_list.events({ - 'click .more-link': function(e) { - e.preventDefault(); - Session.set('currentScroll',$('body').scrollTop()); - postsSubs[Session.get('view')].loadNextPage(); - } -}); -