hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-09 12:16:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'subs-manager' of github.com:arunoda/Telescope into arunoda-subs-manager

Browse source 
Conflicts:
	lib/router.js
This commit is contained in:
Sacha Greif 2014-07-08 15:12:09 +09:00
commit 87378ec656
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/router.js
View file

@ -358,11 +358,9 @@ PostsDigestController = FastRender.RouteController.extend({
PostPageController = FastRender.RouteController.extend({ PostPageController = FastRender.RouteController.extend({
waitOn: function() { waitOn: function() {
return [ this.postSubscription = coreSubscriptions.subscribe('singlePost', this.params._id);
coreSubscriptions.subscribe('singlePost', this.params._id), this.commentSubscription = coreSubscriptions.subscribe('postComments', this.params._id);
coreSubscriptions.subscribe('postComments', this.params._id), this.postUsersSubscription = coreSubscriptions.subscribe('postUsers', this.params._id);
coreSubscriptions.subscribe('postUsers', this.params._id)
];
}, },
post: function() { post: function() {
@ -370,11 +368,14 @@ PostPageController = FastRender.RouteController.extend({
}, },
onBeforeAction: function(pause) { onBeforeAction: function(pause) {
if (this.ready()) {
if (! this.post()) { if (! this.post()) {
if (this.postSubscription.ready()) {
this.render('not_found'); this.render('not_found');
return pause(); return pause();
} }
this.render('loading');
pause();
} }
}, },

1
server/publications.js
View file

@ -181,4 +181,3 @@ Meteor.publish('notifications', function() {
} }
return []; return [];
}); });