From 92d44bf4452141d7067ce63027e7b937cf06c379 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Wed, 8 Jul 2015 16:23:12 +0900 Subject: [PATCH] working on limit parameter --- packages/telescope-daily/lib/server/fastrender.js | 2 +- .../lib/client/templates/posts_list/posts_list_controller.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/telescope-daily/lib/server/fastrender.js b/packages/telescope-daily/lib/server/fastrender.js index f05b3e811..50ad0d642 100644 --- a/packages/telescope-daily/lib/server/fastrender.js +++ b/packages/telescope-daily/lib/server/fastrender.js @@ -11,7 +11,7 @@ var getDays = function (daysCount) { return daysArray; }; -FastRender.route('/daily/:days?',function (params) { +FastRender.route('/daily/:daysCount?',function (params) { var fr = this; var daysCount = params.daysCount ? params.daysCount : daysPerPage; diff --git a/packages/telescope-posts/lib/client/templates/posts_list/posts_list_controller.js b/packages/telescope-posts/lib/client/templates/posts_list/posts_list_controller.js index 14fdd0233..e9ac73827 100644 --- a/packages/telescope-posts/lib/client/templates/posts_list/posts_list_controller.js +++ b/packages/telescope-posts/lib/client/templates/posts_list/posts_list_controller.js @@ -14,7 +14,7 @@ Template.posts_list_controller.onCreated(function () { // initialize the reactive variables instance.terms = new ReactiveVar(instance.data.terms); - instance.postsLimit = new ReactiveVar(Settings.get('postsPerPage', 10)); + instance.postsLimit = new ReactiveVar(instance.data.terms.limit || Settings.get('postsPerPage', 10)); instance.ready = new ReactiveVar(false); // if caching is set to true, use Subs Manager. Else use template.subscribe. Default to false @@ -27,7 +27,7 @@ Template.posts_list_controller.onCreated(function () { instance.autorun(function () { // add a dependency on data context to trigger the autorun var terms = Template.currentData().terms; // ⚡ reactive ⚡ - instance.postsLimit.set(Settings.get('postsPerPage', 10)); + instance.postsLimit.set(instance.data.terms.limit || Settings.get('postsPerPage', 10)); }); // Autorun 2: will re-run when limit or terms are changed