andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix:Replace calls containing deprecated 'uri' parameter of core.LibraryController.lookup().

Browse Source
This commit is contained in:
jcass 2016-01-31 08:17:56 +02:00
parent 19363e1476
commit a81a3ac1d8
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -541,7 +541,7 @@ function getFavourites() {
function addFavourite(uri, name) { function addFavourite(uri, name) {
var uri = uri || $('#streamuriinput').val().trim(); var uri = uri || $('#streamuriinput').val().trim();
var name = name || $('#streamnameinput').val().trim(); var name = name || $('#streamnameinput').val().trim();
mopidy.library.lookup({'uri': uri}).then(function(results) { mopidy.library.lookup({'uris': [uri]}).then(function(results) {
var newTracks = results[uri]; var newTracks = results[uri];
if (newTracks.length == 1) { if (newTracks.length == 1) {
// TODO: Supporting adding an entire playlist? // TODO: Supporting adding an entire playlist?

9
mopidy_musicbox_webclient/static/js/library.js
View File

@ -266,7 +266,8 @@ function showArtist(nwuri) {
//TODO cache //TODO cache
$('#h_artistname').html(''); $('#h_artistname').html('');
showLoading(true); showLoading(true);
mopidy.library.lookup({'uri': nwuri}).then(function(resultArr) { mopidy.library.lookup({'uris': [nwuri]}).then(function(resultDict) {
var resultArr = resultDict[Object.keys(resultDict)[0]];
resultArr.uri = nwuri; resultArr.uri = nwuri;
processArtistResults(resultArr); processArtistResults(resultArr);
}, console.error); }, console.error);
@ -291,7 +292,8 @@ function showAlbum(uri) {
$('#coverpopupalbumname').html(albumname); $('#coverpopupalbumname').html(albumname);
$('#coverpopupartist').html(artistname); $('#coverpopupartist').html(artistname);
showLoading(false); showLoading(false);
mopidy.library.lookup({'uri': uri}).then(function(resultArr) { mopidy.library.lookup({'uris': [uri]}).then(function(resultDict) {
var resultArr = resultDict[Object.keys(resultDict)[0]];
resultArr.uri = uri; resultArr.uri = uri;
processAlbumResults(resultArr); processAlbumResults(resultArr);
}, console.error); }, console.error);
@ -299,7 +301,8 @@ function showAlbum(uri) {
showLoading(true); showLoading(true);
$('#h_albumname').html(''); $('#h_albumname').html('');
$('#h_albumartist').html(''); $('#h_albumartist').html('');
mopidy.library.lookup({'uri': uri}).then(function(resultArr) { mopidy.library.lookup({'uris': [uri]}).then(function(resultDict) {
var resultArr = resultDict[Object.keys(resultDict)[0]];
resultArr.uri = uri; resultArr.uri = uri;
processAlbumResults(resultArr); processAlbumResults(resultArr);
}, console.error); }, console.error);

7
mopidy_musicbox_webclient/static/js/process_ws.js
View File

@ -118,9 +118,10 @@ function processBrowseDir(resultArr) {
iconClass = getMediaClass(resultArr[i].uri); iconClass = getMediaClass(resultArr[i].uri);
if (resultArr[i].type == 'track') { if (resultArr[i].type == 'track') {
//console.log(resultArr[i]); //console.log(resultArr[i]);
mopidy.library.lookup({'uri': resultArr[i].uri}).then(function (resultArr) { mopidy.library.lookup({'uris': [resultArr[i].uri]}).then(function (resultDict) {
popupData[resultArr[0].uri] = resultArr[0]; var uri = Object.keys(resultDict)[0];
browseTracks.push(resultArr[0]); popupData[uri] = resultDict[uri][0];
browseTracks.push(resultDict[uri][0]);
}, console.error); }, console.error);
child += '<li class="song albumli" id="browselisttracks-' + resultArr[i].uri + '">' + child += '<li class="song albumli" id="browselisttracks-' + resultArr[i].uri + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\', \'' + resultArr[i].uri + '\', \'' + index + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\', \'' + resultArr[i].uri + '\', \'' + index + '\');">' +

2
mopidy_musicbox_webclient/static/mb.manifest
View File

@ -1,6 +1,6 @@
CACHE MANIFEST CACHE MANIFEST
# 2016-01-30:v1 # 2016-01-31:v1
NETWORK: NETWORK:
* *