From d25f644c2c3c62b9346a16a15aa53119b27cddc9 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Mon, 1 Sep 2014 09:52:40 +0900 Subject: [PATCH] Profile tweaks; display more posts --- client/views/users/user_profile.html | 2 +- client/views/users/user_profile.js | 3 ++- lib/parameters.js | 2 +- packages/telescope-daily/lib/client/routes.js | 4 +++- packages/telescope-daily/lib/client/templates/posts_daily.js | 4 +++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/client/views/users/user_profile.html b/client/views/users/user_profile.html index 69879abd5..bb95e7d5f 100644 --- a/client/views/users/user_profile.html +++ b/client/views/users/user_profile.html @@ -121,7 +121,7 @@ {{#each comments}} {{postTitle}} - {{body}} + {{{htmlBody}}} {{formatDate createdAt "MM/DD/YYYY, HH:mm"}} {{/each}} diff --git a/client/views/users/user_profile.js b/client/views/users/user_profile.js index 79a30bfff..e344ad54e 100644 --- a/client/views/users/user_profile.js +++ b/client/views/users/user_profile.js @@ -51,7 +51,8 @@ Template[getTemplate('user_profile')].helpers({ // extend comments with each commented post var extendedComments = comments.map(function (comment) { var post = Posts.findOne(comment.postId); - comment.postTitle = post.title; + if(post) // post might not be available anymore + comment.postTitle = post.title; return comment; }); return extendedComments diff --git a/lib/parameters.js b/lib/parameters.js index 9b4826168..d6f17017a 100644 --- a/lib/parameters.js +++ b/lib/parameters.js @@ -16,7 +16,7 @@ getParameters = function (terms) { } }; var parameters = baseParameters; - var view = dashToCamel(terms.view); + var view = !!terms.view ? dashToCamel(terms.view) : 'top'; // if view is not defined, default to "top" // get query parameters according to current view if(typeof viewParameters[view] !== 'undefined') diff --git a/packages/telescope-daily/lib/client/routes.js b/packages/telescope-daily/lib/client/routes.js index e78245d65..6a1e91a74 100644 --- a/packages/telescope-daily/lib/client/routes.js +++ b/packages/telescope-daily/lib/client/routes.js @@ -1,3 +1,5 @@ +var daysPerPage = 5; + var coreSubscriptions = new SubsManager({ // cache recent 50 subscriptions cacheLimit: 50, @@ -10,7 +12,7 @@ var coreSubscriptions = new SubsManager({ PostsDailyController = RouteController.extend({ template: getTemplate('posts_daily'), onBeforeAction: function() { - this.days = this.params.days ? this.params.days : 3; + this.days = this.params.days ? this.params.days : daysPerPage; // this.days = Session.get('postsDays') ? Session.get('postsDays') : 3; var terms = { diff --git a/packages/telescope-daily/lib/client/templates/posts_daily.js b/packages/telescope-daily/lib/client/templates/posts_daily.js index d45e1b3e6..5cb3455eb 100644 --- a/packages/telescope-daily/lib/client/templates/posts_daily.js +++ b/packages/telescope-daily/lib/client/templates/posts_daily.js @@ -1,3 +1,5 @@ +var daysPerPage = 5; + var getPosts = function (date) { var terms = { view: 'digest', @@ -34,7 +36,7 @@ Template[getTemplate('postsDaily')].helpers({ return getPosts(this.date); }, loadMoreUrl: function () { - var count = parseInt(Session.get('postsDays')) + 3; + var count = parseInt(Session.get('postsDays')) + daysPerPage; return '/daily/' + count; } }); \ No newline at end of file