yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added push for extra Defaults, Added Artist Search

Browse source
This commit is contained in:
Trevor Squillario 2014-01-12 19:40:48 -05:00
parent 0db50559e7
commit ff10d7779c
7 changed files with 79 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/controllers/main.js
View file

@ -8,7 +8,7 @@ function AppCtrl($scope, $rootScope, $document, $location, utils, globals, model
$rootScope.Genres = [];
$rootScope.selectedPlaylist = "";
$rootScope.selectedAutoPlaylist = "";
$rootScope.selectedMusicFolder = "";
$rootScope.SelectedMusicFolder = "";
$rootScope.unity;
$rootScope.loggedIn = function () {
if (globals.settings.Server != '' && globals.settings.Username != '' && globals.settings.Password != '') {
@ -351,7 +351,7 @@ function AppCtrl($scope, $rootScope, $document, $location, utils, globals, model
}
i++;
});
$rootScope.selectedMusicFolder = $rootScope.MusicFolders[index];
$rootScope.SelectedMusicFolder = $rootScope.MusicFolders[index];
}
$scope.$apply();
}
@ -482,9 +482,9 @@ function AppCtrl($scope, $rootScope, $document, $location, utils, globals, model
if (typeof folder == 'number' && folder != '' && folder != 'all') {
//alert(folder);
folderParams = '&musicFolderId=' + folder;
} else if (typeof $rootScope.selectedMusicFolder.id != 'undefined') {
//alert($rootScope.selectedMusicFolder.id);
folderParams = '&musicFolderId=' + $rootScope.selectedMusicFolder.id;
} else if (typeof $rootScope.SelectedMusicFolder.id != 'undefined') {
//alert($rootScope.SelectedMusicFolder.id);
folderParams = '&musicFolderId=' + $rootScope.SelectedMusicFolder.id;
}
$.ajax({
url: globals.BaseURL() + '/getRandomSongs.view?' + globals.BaseParams() + '&size=' + size + genreParams + folderParams,