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

Merge remote-tracking branch 'Concept211/master' into test

Browse source 
Conflicts:
	js/ui-ready.js
This commit is contained in:
Trevor Squillario 2012-09-28 15:35:06 -04:00
commit 9c5f0e37c5
4 changed files with 74 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
js/ui-ready.js
View file

@ -1,4 +1,4 @@
$(document).ready(function () {
$(document).ready(function () {
//User config staff
$('#Username').val($.cookie('username'));
//$('#Password').val($.cookie('passwordenc'));
@ -402,18 +402,24 @@
return false;
});
// Playlist Click Events
$('#AutoPlaylistContainer li.item').live('click', function () {
$('#AutoPlaylistContainer li.item, #FolderContainer li.item').live('click', function () {
$('#AutoPlaylistContainer li').removeClass('selected');
$('#PlaylistContainer li').removeClass('selected');
$(this).addClass('selected');
getRandomSongList('', '#TrackContainer');
var genre = $(this).data('genre');
var folder = $(this).data('folder');
getRandomSongList('', '#TrackContainer', genre, folder);
});
$('#AutoPlaylistContainer li.item a.play').live('click', function () {
getRandomSongList('autoplay', '#CurrentPlaylistContainer');
$('#AutoPlaylistContainer li.item a.play, #FolderContainer li.item a.play').live('click', function () {
var genre = $(this).data('genre');
var folder = $(this).data('folder');
getRandomSongList('autoplay', '#CurrentPlaylistContainer', genre, folder);
return false;
});
$('#AutoPlaylistContainer li.item a.add').live('click', function () {
getRandomSongList('', '#CurrentPlaylistContainer');
$('#AutoPlaylistContainer li.item a.add, #FolderContainer li.item a.add').live('click', function () {
var genre = $(this).data('genre');
var folder = $(this).data('folder');
getRandomSongList('', '#CurrentPlaylistContainer', genre, folder);
return false;
});
$('#PlaylistContainer li.item').live('click', function () {
@ -437,6 +443,7 @@
});
$('#action_RefreshPlaylists').click(function () {
loadPlaylists(true);
loadFolders(true);
return false;
});
$('#action_DeletePlaylist').click(function () {
@ -679,4 +686,5 @@
}
}).disableSelection();
}); // End document.ready
}); // End document.ready