Possibly fixed loading issue for queue and songs.

app/client/scripts/main.js

@@ -14,11 +14,9 @@ Meteor.startup(function() {
 });
 
 Deps.autorun(function() {
-    Meteor.subscribe("queues");
     Meteor.subscribe("reports");
     Meteor.subscribe("chat");
     Meteor.subscribe("playlists");
-    Meteor.subscribe("songs");
     Meteor.subscribe("alerts");
     Meteor.subscribe("rooms");
     Meteor.subscribe("private_rooms");

app/client/scripts/onRendered.js

@@ -1,4 +1,5 @@
 Template.queues.onRendered(function() {
+    Meteor.subscribe('queues');
     $("#previewModal").on("hidden.bs.modal", function() {
         if (previewEndSongTimeout !== undefined) {
             Meteor.clearTimeout(previewEndSongTimeout);
@@ -24,6 +25,7 @@ Template.queues.onRendered(function() {
 });
 
 Template.manageStation.onRendered(function() {
+    Meteor.subscribe("songs");
     $("#previewModal").on("hidden.bs.modal", function() {
         if (previewEndSongTimeout !== undefined) {
             Meteor.clearTimeout(previewEndSongTimeout);
@@ -49,6 +51,7 @@ Template.manageStation.onRendered(function() {
 });
 
 Template.manageSongs.onRendered(function() {
+    Meteor.subscribe("songs");
     $("#previewModal").on("hidden.bs.modal", function() {
         if (previewEndSongTimeout !== undefined) {
             Meteor.clearTimeout(previewEndSongTimeout);

app/client/scripts/routes.js

@@ -212,7 +212,7 @@ Router.route("/private/:name", {
 
 Router.route("/:type", {
     waitOn: function() {
-        return [Meteor.subscribe("isModerator", Meteor.userId()), Meteor.subscribe("isAdmin", Meteor.userId()), Meteor.subscribe("rooms")];
+        return [Meteor.subscribe("songsType", this.params.type), Meteor.subscribe("isModerator", Meteor.userId()), Meteor.subscribe("isAdmin", Meteor.userId()), Meteor.subscribe("rooms")];
     },
     action: function() {
         var user = Meteor.users.findOne({});

app/server/server.js

@@ -781,8 +781,12 @@ Meteor.publish("private_playlists", function () {
     }
 });
 
+Meteor.publish("songsType", function (type) {
+    return Songs.find({genres: type});
+});
+
 Meteor.publish("songs", function () {
-    return Songs.find({});
+    return Songs.find();
 });
 
 Meteor.publish("queues", function () {