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

2.2.2 Re-enable drag and drop, ogg support, misc bug fixes

Browse source
This commit is contained in:
Trevor Squillario 2012-10-25 16:45:45 -04:00
parent 2ea9027235
commit 1265cb8449
10 changed files with 107 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/ui-ready.js
View file

@ -65,12 +65,16 @@
}
// Table Sorting
$('#CurrentPlaylistContainer').stupidtable();
$('#TrackContainer').stupidtable();
$('#PodcastContainer').stupidtable();
$('#AlbumContainer').stupidtable();
$('#action_RequestURL').click(function () {
askPermission();
return false;
});
// Tabs
$('.tabcontent').hide(); //Hide all content
if (!getCookie('username') && !getCookie('passwordenc') && !getCookie('Server')) {
@ -629,7 +633,7 @@
msg = 'Autopilot On';
if ($('#CurrentPlaylistContainer tbody').html() == '') {
$('#CurrentPlaylistContainer tbody').empty();
getRandomSongList('', '#CurrentPlaylistContainer tbody', '', '');
getRandomSongList('autoplay', '#CurrentPlaylistContainer tbody', '', '');
$('#currentActions a.button').removeClass('disabled');
}
}
@ -642,8 +646,8 @@
$('#AutoPlaylistContainer li.item, #FolderContainer li.item').live('click', function () {
$('#AutoPlaylistContainer li, #FolderContainer li, #PlaylistContainer li').removeClass('selected');
$(this).addClass('selected');
var genre = $(this).data('genre');
var folder = $(this).data('folder');
var genre = $(this).data('genre') !== undefined ? $(this).data('genre') : '';
var folder = $(this).data('folder') !== undefined ? $(this).data('folder') : '';
getRandomSongList('', '#TrackContainer tbody', genre, folder);
});
$('#AutoPlaylistContainer li.item a.play, #FolderContainer li.item a.play').live('click', function () {
@ -909,8 +913,9 @@
if ($('#SaveTrackPosition').is(':checked')) {
setCookie('SaveTrackPosition', '1');
var sm = soundManager.getSoundById('audio');
if (sm !== undefined) {
if (sm) {
saveTrackPosition();
alert('save');
}
} else {
setCookie('SaveTrackPosition', null);
@ -942,7 +947,6 @@
return false;
});
/*
// JQuery UI Sortable - Drag and drop sorting
var fixHelper = function (e, ui) {
ui.children().each(function () {
@ -956,6 +960,5 @@
$("#TrackContainer tbody").sortable({
helper: fixHelper
}).disableSelection();
*/
}); // End document.ready