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

fix:library.lookup calls.

Browse Source
This commit is contained in:
jcass 2016-01-30 15:34:10 +02:00
parent 28a42f40eb
commit 20818b29b2
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy_musicbox_webclient/static/index.html
View File

@ -475,13 +475,11 @@
<!-- /page one --> <!-- /page one -->
<script type="text/javascript" src="../mopidy/mopidy.min.js"></script> <script type="text/javascript" src="../mopidy/mopidy.min.js"></script>
<script type="text/javascript" src="js/iscroll-lite.js"></script> <script type="text/javascript" src="js/iscroll-lite.js"></script>
<!-- <script type="text/javascript" src="js/jquery.mobile.iscrollview-closure-min.js"></script> -->
<script src="js/jquery.cookie.js"></script> <script src="js/jquery.cookie.js"></script>
<script src="js/jquery.truncate.min.js"></script> <script src="js/jquery.truncate.min.js"></script>
<!-- <script type="text/javascript" src="js/add2home.js" charset="utf-8"></script> --> <script src="js/functionsvars.js"></script>
<script src="js/controls.js"></script> <script src="js/controls.js"></script>
<script src="js/library.js"></script> <script src="js/library.js"></script>
<script src="js/functionsvars.js"></script>
<script src="js/process_ws.js"></script> <script src="js/process_ws.js"></script>
<script src="js/streamuris.js"></script> <script src="js/streamuris.js"></script>

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({'uris': [uri]}).then(function(results) { mopidy.library.lookup({'uri': 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?

2
mopidy_musicbox_webclient/static/js/functionsvars.js
View File

@ -411,7 +411,7 @@ function getPlaylistTracks(uri) {
} else { } else {
showLoading(true); showLoading(true);
return mopidy.playlists.getItems({'uri': uri}).then(function(refs) { return mopidy.playlists.getItems({'uri': uri}).then(function(refs) {
return processPlaylistItems({'uri':uri, 'items':refs}); return processPlaylistItems({'uri': uri, 'items': refs});
}, console.error); }, console.error);
} }
} }

2
mopidy_musicbox_webclient/static/js/images.js
View File

@ -8,7 +8,7 @@ API_SECRET = '2c631802c2285d5d5d1502462fe42a2b';
var fmcache; var fmcache;
var lastfm; var lastfm;
$(window).load(function () { $(window).load(function() {
// create a Cache object // create a Cache object
fmcache = new LastFMCache(); fmcache = new LastFMCache();
// create a LastFM object // create a LastFM object

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

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

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

@ -118,7 +118,7 @@ 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({'uris': [resultArr[i].uri]}).then(function (resultArr) { mopidy.library.lookup({'uri': resultArr[i].uri}).then(function (resultArr) {
popupData[resultArr[0].uri] = resultArr[0]; popupData[resultArr[0].uri] = resultArr[0];
browseTracks.push(resultArr[0]); browseTracks.push(resultArr[0]);
}, console.error); }, console.error);