Add an url of a radio station stream that you want to listen to in the boxes below. The last 25 stations are saved locally (not
on the server yet). To find stations, use the Browse function with extensions like Dirble or TuneIn, the right values will appear in these boxes automatically. Or use websites like Listenlive or ';
+ child = ' ';
child += '' + name + ' ';
tmp += child;
}
diff --git a/webclient/js/functionsvars.js b/webclient/js/functionsvars.js
index f428854..377971c 100644
--- a/webclient/js/functionsvars.js
+++ b/webclient/js/functionsvars.js
@@ -171,7 +171,7 @@ function renderSongLi(song, liID, uri, playlistType){
}
function resultsToTables(results, target, uri) {
-console.log(results, target, uri);
+//console.log(results, target, uri);
if (!results) { return }
if (target == '#currenttable') {
playlistType = 'playTrackQueueByUri';
@@ -278,7 +278,7 @@ console.log(results, target, uri);
} //albums name
}
}
- console.log(html);
+// console.log(html);
tableid = "#" + tableid;
$(target).html(html);
$(target).attr('data', uri);
diff --git a/webclient/js/gui.js b/webclient/js/gui.js
index 25a12d8..1b056e4 100644
--- a/webclient/js/gui.js
+++ b/webclient/js/gui.js
@@ -19,23 +19,38 @@ function resetSong() {
setSongInfo(data);
}
}
-//console.log('test');
function resizeMb() {
$("#infoname").html(songdata.name);
$("#infoartist").html(artiststext);
// //set height of playlist scrollers
+// togglePlaylists();
- if ($(window).width() > 480) {
+ if ($(window).width() > 960) {
+ $('#playlisttracksdiv').show();
+ $('#playlistslistdiv').show();
+ } else {
+ if ( $('#playlisttracksdiv').is(':visible') == $('#playlistslistdiv').is(':visible')) {
+ $('#playlisttracksdiv').hide();
+ $('#playlistslistdiv').show();
+ }
+ }
+
+/* if ($('#playlisttracksdiv').is(':visible') && !$('#playlisttracksback').is(':visible') ) {
$('.scroll').height($(window).height() - 96);
//jqm added something which it shouldnt (at least in this case) I guess
// $('#playlistspane').removeClass('height').height($(window).height() - 110);
$('.scroll').removeClass('height').removeClass('width');
$('#playlistspane').removeClass('height').removeClass('width');
+// $('#playlisttracksdiv').show();
+// $('#playlistslistdiv').show();
} else {
$('.scroll').addClass('height', '99%').addClass('width', '99%');
$('#playlistspane').addClass('height', '99%').addClass('width', '99%');
+// $('#playlisttracksdiv').show();
+// $('#playlistslistdiv').show();
}
+*/
/*
if (isMobileWebkit && ($(window).width() > 480)) {
playlistslistScroll.refresh();
diff --git a/webclient/js/lastfm.js b/webclient/js/lastfm.js
index 44daed1..f3a5ed3 100644
--- a/webclient/js/lastfm.js
+++ b/webclient/js/lastfm.js
@@ -35,7 +35,7 @@ function getCover(nwartist, nwalbum, image, size) {
}});
}
function getArtistImage(nwartist, image, size) {
- $(image).attr('src', '../images/icons/user_24x32.png');
+ $(image).attr('src', '../images/user_24x32.png');
lastfm.artist.getInfo({artist: nwartist}, {success: function(data){
for (var i = 0; i < data.artist.image.length; i++) {
if ( data.artist.image[i]['size'] == size) {
diff --git a/webclient/js/library.js b/webclient/js/library.js
index 1302ef0..59ce059 100644
--- a/webclient/js/library.js
+++ b/webclient/js/library.js
@@ -27,10 +27,12 @@ function initSearch() {
delete customTracklists['albumresultscache'];
delete customTracklists['trackresultscache'];
$("#searchresults").hide();
-
+// var limit = new Object;
+
mopidy.library.search({
- any : value
+ any: [value]
}).then(processSearchResults, console.error);
+ console.log('search sent', value);
}
}
@@ -38,6 +40,7 @@ function initSearch() {
* process results of a search
*********************************************************/
function processSearchResults(resultArr) {
+ console.log('srch', resultArr);
$(SEARCH_TRACK_TABLE).empty();
$(SEARCH_ARTIST_TABLE).empty();
$(SEARCH_ALBUM_TABLE).empty();
@@ -46,7 +49,6 @@ function processSearchResults(resultArr) {
var results = {'tracks': [], 'artists': [], 'albums': []};
var emptyResult = true;
-// console.log(resultArr, 'resultArr');
for (var i = 0; i < resultArr.length; ++i) {
for (var prop in results) {
@@ -174,10 +176,17 @@ function getCurrentPlaylist() {
/********************************************************
* Show tracks of playlist
********************************************************/
+function togglePlaylists() {
+ if ($(window).width() <= 960) {
+ $('#playlisttracksdiv').toggle();
+ $('#playlistslistdiv').toggle();
+ }
+ return true;
+}
+
function showTracklist(uri) {
$(PLAYLIST_TABLE).empty();
- $('#playlisttracksdiv').show();
-
+ togglePlaylists();
var pl = getPlaylistFromUri(uri);
//load from cache
if (pl) {
@@ -192,7 +201,7 @@ function showTracklist(uri) {
$(this).addClass('playlistactive');
}
});
- scrollToTracklist();
+// scrollToTracklist();
//lookup recent tracklist
mopidy.playlists.lookup(uri).then(processGetTracklist, console.error);
return false;
diff --git a/webclient/js/process_ws.js b/webclient/js/process_ws.js
index 7fa9ef4..06e9d14 100644
--- a/webclient/js/process_ws.js
+++ b/webclient/js/process_ws.js
@@ -97,7 +97,8 @@ function processBrowseDir(resultArr) {
rooturi = rooturi.slice(0, lastindex);
if (browseStack.length > 0) {
- child += '.. ..