1.9.6 misc bug fix

This commit is contained in:
Trevor Squillario 2012-04-03 15:48:01 -04:00
parent 7c788a0efb
commit 5c334d7e3b

View file

@ -408,8 +408,14 @@ function playSong(el, songid, albumid) {
success: function (data) { success: function (data) {
var title, artist, album; var title, artist, album;
if (data["subsonic-response"].directory !== undefined) { if (data["subsonic-response"].directory !== undefined) {
// There is a bug in the API that doesn't return a JSON array for one artist
var children = [];
if (data["subsonic-response"].directory.child.length > 0) { if (data["subsonic-response"].directory.child.length > 0) {
$.each(data["subsonic-response"].directory.child, function (i, child) { children = data["subsonic-response"].directory.child;
} else {
children[0] = data["subsonic-response"].directory.child;
}
$.each(children, function (i, child) {
if (child.id === songid) { if (child.id === songid) {
title = child.title; title = child.title;
artist = child.artist; artist = child.artist;
@ -418,7 +424,6 @@ function playSong(el, songid, albumid) {
} }
}); });
} }
}
$('#songdetails_song').html(title); $('#songdetails_song').html(title);
$('#songdetails_song').attr('parentid', albumid); $('#songdetails_song').attr('parentid', albumid);
$('#songdetails_song').attr('childid', songid); $('#songdetails_song').attr('childid', songid);
@ -428,7 +433,7 @@ function playSong(el, songid, albumid) {
$('#playermiddle').css('visibility', 'visible'); $('#playermiddle').css('visibility', 'visible');
$('#songdetails').css('visibility', 'visible'); $('#songdetails').css('visibility', 'visible');
// SoundManager Initialize // SoundManager Initialize
var salt = Math.floor(Math.random()*100000); var salt = Math.floor(Math.random() * 100000);
if (audio) { if (audio) {
soundManager.destroySound('audio'); soundManager.destroySound('audio');
} }
@ -1125,15 +1130,15 @@ function updateMessage(msg) {
} }
// Convert to unicode support // Convert to unicode support
var toHTML = { var toHTML = {
on: function(str) { on: function (str) {
var a = [], var a = [],
i = 0; i = 0;
for (; i < str.length;) a[i] = str.charCodeAt(i++); for (; i < str.length; ) a[i] = str.charCodeAt(i++);
return "&#" + a.join(";&#") + ";" return "&#" + a.join(";&#") + ";"
}, },
un: function(str) { un: function (str) {
return str.replace(/&#(x)?([^&]{1,5});?/g, return str.replace(/&#(x)?([^&]{1,5});?/g,
function(a, b, c) { function (a, b, c) {
return String.fromCharCode(parseInt(c, b ? 16 : 10)) return String.fromCharCode(parseInt(c, b ? 16 : 10))
}) })
} }