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

Use a fake 'mbw:' URI scheme for our internal track caches. (Fixes #109).

Browse Source 
Better solution is to prevent sending our internal cache URIs to Mopidy in the first place.
Also removed unused customPlaylists.
This commit is contained in:
Nick Steel 2015-06-18 00:13:55 +01:00
parent 0a4c3ceed3
commit ad816350f9
4 changed files with 9 additions and 13 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

@ -153,7 +153,7 @@ function playTrackByUri(track_uri, playlist_uri) {
func = mopidy.tracklist.add(null, null, playlist_uri);
func.then(
function(tltracks) {
//check if tltracks is filled, some backends (gmusic) do not support adding by uri, it seems
//check if tltracks is filled, some backends (gmusic, m3u) do not support adding by uri, it seems
if (tltracks.length == 0) {
var tracks = getTracksFromUri(playlist_uri);
mopidy.tracklist.add(tracks).then(findAndPlayTrack);

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

@ -37,7 +37,6 @@ var playlistslistScroll;
//array of cached playlists (not only user-playlists, also search, artist, album-playlists)
var playlists = {};
var currentplaylist;
var customPlaylists = [];
var customTracklists = [];
var browseStack = [];
@ -408,9 +407,6 @@ function getPlaylistFromUri(uri) {
if (playlists[uri]) {
return playlists[uri];
}
if (customPlaylists[uri]) {
return customPlaylists[uri];
}
}
function getTracksFromUri(uri) {

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

@ -410,7 +410,7 @@ function locationHashChanged() {
case 'search':
$('#navsearch a').addClass($.mobile.activeBtnClass);
$("#searchinput").focus();
if (customTracklists['allresultscache'] == '') {
if (customTracklists['mbw:allresultscache'] == '') {
initSearch($('#searchinput').val());
}
break;

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

@ -23,10 +23,10 @@ function initSearch() {
document.activeElement.blur();
$("input").blur();
delete customTracklists['allresultscache'];
delete customTracklists['artistresultscache'];
delete customTracklists['albumresultscache'];
delete customTracklists['trackresultscache'];
delete customTracklists['mbw:allresultscache'];
delete customTracklists['mbw:artistresultscache'];
delete customTracklists['mbw:albumresultscache'];
delete customTracklists['mbw:trackresultscache'];
$("#searchresults").hide();
if (searchService != 'all') {
@ -113,7 +113,7 @@ function processSearchResults(resultArr) {
customTracklists['trackresultscache'] = results.tracks;
customTracklists['mbw:trackresultscache'] = results.tracks;
if (emptyResult) {
toast('No results');
@ -196,8 +196,8 @@ function processSearchResults(resultArr) {
$('#expandsearch').show();
// Track results
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'mbw:trackresultscache');
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'mbw:trackresultscache');
showLoading(false);
}