From 0469c3de1155f003b6eb93ab8d61f67b144043b9 Mon Sep 17 00:00:00 2001 From: Wouter van Wijk Date: Wed, 2 Jan 2013 10:19:38 +0100 Subject: [PATCH] small updates --- css/ws.css | 6 ++++-- index.html | 56 ++++++++++++++++++++++++++++-------------------------- js/gui.js | 6 ++++-- js/ws.js | 10 +++++----- 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/css/ws.css b/css/ws.css index 833ba74..314ce9d 100755 --- a/css/ws.css +++ b/css/ws.css @@ -59,6 +59,9 @@ a.name, a.album, a.artist { height: 100%; } + + + body { padding-top: 80px; } @@ -138,8 +141,7 @@ div { } .content { - /*visibility:hidden; - /*display:none;*/ + display:none; } .currenttrack { diff --git a/index.html b/index.html index c28b9fc..f3564fb 100755 --- a/index.html +++ b/index.html @@ -34,33 +34,7 @@ - - - - - +
@@ -256,6 +230,34 @@
+ + + + diff --git a/js/gui.js b/js/gui.js index 706b674..b199dd5 100755 --- a/js/gui.js +++ b/js/gui.js @@ -76,7 +76,7 @@ function resizeSonginfo () { } function setSongInfo(data) { - console.log(data); + //console.log(data); artistshtml = ''; artiststext = ''; @@ -286,6 +286,8 @@ function triggerPos() { } function getPlaylists() { +// d = new Date(); +// console.log('Getplaylists: ' + d.getMilliseconds() ); mopidy.playlists.getPlaylists().then(handleGetplaylists, console.error); } @@ -329,8 +331,8 @@ function initSocketevents() { }); mopidy.on("event:trackPlaybackStarted", function (data) { - setSongInfo(data.tl_track.track); mopidy.playback.getTimePosition().then(currentPositionResults, console.error); + setSongInfo(data.tl_track.track); setPlayState(true); initTimer(); }); diff --git a/js/ws.js b/js/ws.js index b1d9d2c..f1af15d 100755 --- a/js/ws.js +++ b/js/ws.js @@ -8,8 +8,8 @@ //play uri, update playlist to player if needed function playtrack(uri, playlisturi) { trackslist = new Array(); - console.log('play uri:' + uri); - console.log('playlist uri:' + playlisturi); +// console.log('play uri:' + uri); +// console.log('playlist uri:' + playlisturi); var track; switchContent('current', uri); tracks = getTracksFromUri(playlisturi); @@ -27,7 +27,7 @@ function playtrack(uri, playlisturi) { } } // console.log(pl.tracks); - console.log(track); + console.log(track); mopidy.playback.stop(true); for (var i = 0; i < track; i++) { @@ -74,7 +74,7 @@ function handleGetplaylists(resultArr) { /*