CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.

- merging with devel
This commit is contained in:
Daniel 2012-03-12 10:20:58 -04:00
parent 470cf0dbf8
commit 48aeaaf05a
1 changed files with 14 additions and 29 deletions

View File

@ -647,34 +647,19 @@
} }
var preview_window = null; var audio_preview_window = null;
function openAudioPreview(event) { function open_audio_preview(fileID, index) {
event.stopPropagation(); url = 'Playlist/audio-preview-player/fileID/'+fileID+'/index/'+index;
//$.post(baseUri+'Playlist/audio-preview-player', {fileName: fileName, cueIn: cueIn, cueOut: cueOut, fadeIn: fadeIn, fadeInFileName: fadeInFileName, fadeOut: fadeOut, fadeOutFileName: fadeOutFileName})
var audioFileID = $(this).attr('audioFile'); if (audio_preview_window == null || audio_preview_window.closed){
var playlistID = $('#pl_id:first').attr('value'); audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95');
var playlistIndex = $(this).parent().parent().attr('id'); } else if (!audio_preview_window.closed) {
playlistIndex = playlistIndex.substring(4); //remove the spl_ audio_preview_window.play(fileID);
} else {
open_playlist_preview(audioFileID, "", "", playlistID, playlistIndex); console.log("something else : "+baseUrl+url);
}
function open_playlist_preview(audioFileID, audioFileTitle, audioFileArtist, playlistID, playlistIndex) {
if (playlistIndex != undefined)
url = 'Playlist/playlist-preview/audioFileID/'+audioFileID+'/playlistIndex/'+playlistIndex+'/playlistID/'+playlistID;
else
url = 'Playlist/playlist-preview/audioFileID/'+audioFileID+'/audioFileArtist/'+audioFileArtist+'/audioFileTitle/'+audioFileTitle;
//$.post(baseUri+'Playlist/audio-preview-player', {fileName: fileName, cueIn: cueIn, cueOut: cueOut, fadeIn: fadeIn, fadeInFileName: fadeInFileName, fadeOut: fadeOut, fadeOutFileName: fadeOutFileName})
if (preview_window == null || preview_window.closed || playlistIndex === undefined){
preview_window = window.open(url, 'Audio Player', 'width=450,height=800');
} else if (!preview_window.closed) {
preview_window.playAll(playlistID, playlistIndex);
}
//Set the play button to pause.
//var elemID = "spl_"+elemIndexString;
//$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
return false;
} }
return false;
}