Merge branch 'master' of https://github.com/AkiraLaine/music-app

app/app.css

@@ -1121,4 +1121,7 @@ nav form input[type="image"]{
 #room-icons {
     margin-top: 11px;
     float: left;
+}
+#time-display {
+    color: white;
 }

app/app.js

@@ -870,7 +870,7 @@ if (Meteor.isClient) {
             if (currentSong !== undefined) {
                 var room = Rooms.findOne({type: type});
                 if (room !== undefined) {
-                    return Date.now() - currentSong.started + room.timePaused;
+                    return Date.now() - currentSong.started - room.timePaused;
                 }
             }
             return 0;
@@ -891,6 +891,7 @@ if (Meteor.isClient) {
         }
 
         function startSong() {
+            $("#time-elapsed").text("0:00");
             if (currentSong !== undefined) {
                 if (_sound !== undefined) _sound.stop();
                 if (yt_player !== undefined && yt_player.stopVideo !== undefined) yt_player.stopVideo();
@@ -994,9 +995,11 @@ if (Meteor.isClient) {
 
                     if (currentSong !== undefined) {
                         if (room !== undefined) {
-                            var duration = (Date.now() - currentSong.started + room.timePaused) / 1000;
+                            var duration = (Date.now() - currentSong.started - room.timePaused) / 1000;
                             var d = moment.duration(duration, 'seconds');
-                            $("#time-elapsed").text(d.minutes() + ":" + ("0" + d.seconds()).slice(-2));
+                            if (Session.get("state") === "playing") {
+                                $("#time-elapsed").text(d.minutes() + ":" + ("0" + d.seconds()).slice(-2));
+                            }
                         }
                     }
                 }, 1000);

app/templates/room.html

@@ -36,7 +36,7 @@
                         </div>
                         <div id="song-info" class="col-md-4" style="margin-top:15px">
                           <img class="song-img" onError="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'" id="song-img"/>
-                          <h2 class="room-title">{{{title}}} <small>(<span id="time-elapsed"></span> / <span>{{songDuration}}</span>)</small></h2>
+                          <h2 class="room-title">{{{title}}} <small id="time-display">(<span id="time-elapsed"></span> / <span>{{songDuration}}</span>)</small></h2>
                           <h2 class="room-artist">{{{artist}}}</h2>
                         </div>
                     </div>