Browse Source

Merge remote-tracking branch 'origin/february_release' into february_release

KrisVos130 9 years ago
parent
commit
8c662fa22b
2 changed files with 3 additions and 1 deletions
  1. 1 0
      app/client/scripts/onCreated.js
  2. 2 1
      app/client/scripts/routes.js

+ 1 - 0
app/client/scripts/onCreated.js

@@ -188,6 +188,7 @@ Template.room.onCreated(function () {
         var d = moment.duration(parseInt(songData.duration), 'seconds');
         var d = moment.duration(parseInt(songData.duration), 'seconds');
         $("#time-total").text(d.minutes() + ":" + ("0" + d.seconds()).slice(-2));
         $("#time-total").text(d.minutes() + ":" + ("0" + d.seconds()).slice(-2));
         Session.set("timeFormat", d.minutes() + ":" + ("0" + d.seconds()).slice(-2));
         Session.set("timeFormat", d.minutes() + ":" + ("0" + d.seconds()).slice(-2));
+        document.title = Session.get("title") + " - " + Session.get("artist") + " - Musare"
     }
     }
 
 
     function resizeSeekerbar() {
     function resizeSeekerbar() {

+ 2 - 1
app/client/scripts/routes.js

@@ -10,11 +10,12 @@ Router.onBeforeAction(function() {
             if (res) {
             if (res) {
                 self.render('banned');
                 self.render('banned');
             } else {
             } else {
+                document.title = 'Musare';
                 next();
                 next();
             }
             }
         });
         });
     } else {
     } else {
-        next();
+       this.next();
     }
     }
 });
 });