don't wait on loading songs

Rayman · Oct 31, 2014 · 538da2a · 538da2a
1 parent aeec781
commit 538da2a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/both/router.js b/both/router.js
@@ -42,19 +42,17 @@ Router.map(function() {
 
   this.route('playlist', {
     path: '/playlist/:_id',
-    onBeforeAction: function() {
+    subscriptions: function() {
       console.log("subscribe to playlist", this.params._id);
-      this.subscribe('playlist', this.params._id);
+      this.subscribe('playlist', this.params._id).wait();
       var playlist = this.data();
       if (!playlist) {
         console.warn("no playlist");
         return;
       }
       var songs = playlist.songs || [];
       songs = _.pluck(songs, 'songId');
-      //add another subscription to waiting list
       this.subscribe('songs', songs);
-      this.next();
     },
     loadingTemplate: 'playlist',
     data: function() {
@@ -64,13 +62,12 @@ Router.map(function() {
   });
 
   this.route('loved', {
-    onBeforeAction: function() {
+    subscriptions: function() {
       var user = Meteor.user();
       if (!user)
         return;
       var songs = user.profile.lovedSongs;
       this.subscribe('songs', songs);
-      this.next();
     },
     data: {
       lovedSongs: function() {