From 561f0cf77ea807546b2feb9e892a5ef20a399412 Mon Sep 17 00:00:00 2001 From: Wouter van Wijk Date: Tue, 1 Jan 2013 23:39:57 +0100 Subject: [PATCH] added offline and datagetting modal warnings. nice! --- index.html | 31 ++++++++++++++++++++++++++++--- js/functionsvars.js | 9 +++------ js/gui.js | 4 ++++ js/ws.js | 2 ++ 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index 2251f61..c28b9fc 100755 --- a/index.html +++ b/index.html @@ -35,7 +35,32 @@ - + + + +
@@ -143,7 +168,7 @@
-
+

Album

@@ -168,7 +193,7 @@
-
+

Artist

diff --git a/js/functionsvars.js b/js/functionsvars.js index ac7d1a0..40ce864 100755 --- a/js/functionsvars.js +++ b/js/functionsvars.js @@ -43,13 +43,10 @@ SEARCH_ALBUM_TABLE = '#albumresulttable'; SEARCH_ARTIST_TABLE = '#artistresulttable'; SEARCH_TRACK_TABLE = '#trackresulttable'; -WEB_SOCKET_SWF_LOCATION = "/static/WebSocketMain.swf"; -WEB_SOCKET_DEBUG = true; - -//process updated playlist to gui +//A hack to find the name of the first artist of a playlist. this is not yet returned by mopidy +//does not work wel with multiple artists of course function getArtist(pl) { for (var i = 0; i < pl.length; i++) { - var child = '' + pl[i]["name"] + ""; for (var j = 0; j < pl[i]["artists"].length; j++) { if (pl[i]["artists"][j]["name"] != '') { return pl[i]["artists"][j]["name"]; @@ -58,7 +55,7 @@ function getArtist(pl) { }; } -//process updated playlist to gui +//A hack to find the first album of a playlist. this is not yet returned by mopidy function getAlbum(pl) { for (var i = 0; i < pl.length; i++) { if(pl[i]["album"]["name"] != '') { diff --git a/js/gui.js b/js/gui.js index b2acd8c..ff2eab8 100755 --- a/js/gui.js +++ b/js/gui.js @@ -314,6 +314,8 @@ function updateStatusOfAll() { function initSocketevents() { mopidy.on("state:online", function () { + $("#offlinemodal").modal('hide'); + $("#loadingmodal").modal('show'); getCurrentPlaylist(); updateStatusOfAll(); getPlaylists(); @@ -322,6 +324,7 @@ function initSocketevents() { mopidy.on("state:offline", function () { resetSong(); + $("#offlinemodal").modal('show'); }); mopidy.on("event:trackPlaybackStarted", function (data) { @@ -452,6 +455,7 @@ $(document).ready(function() { case 'playlists': break; case 'search': + $("div.searchpane input").focus(); if (customTracklists['allresultscache'] == '') { initSearch( $('#searchinput').val() ); } break; case 'artists': diff --git a/js/ws.js b/js/ws.js index 181fac5..6f14d43 100755 --- a/js/ws.js +++ b/js/ws.js @@ -83,6 +83,7 @@ function handleGetplaylists(resultArr) { $('#playlistslist').empty(); $('#playlistslist').html(tmp); $('#playlistsloader').hide(); + $("#loadingmodal").modal('hide'); } //process results of a returned playlist @@ -166,6 +167,7 @@ function handleAlbumResults(resultArr) { customTracklists[resultArr["uri"]] = resultArr; playlisttotable(resultArr, ALBUM_TABLE, resultArr["uri"]); $('#h_albumname').html(getAlbum(resultArr)); + //$('#h_albumartist').html('' + getArtist(resultArr) + ''); $('#h_albumartist').html(getArtist(resultArr)); $('#albumsloader').hide(); }