Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3391: Audio Preview cannot play tracks with commas in their filename

Browse source 
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
This commit is contained in:
Daniel 2012-03-06 13:50:07 -05:00
parent 348011dbc3
commit 709e117f41
8 changed files with 22 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/public/js/airtime/library/library.js
View file

@ -160,7 +160,7 @@
//add the play function to the library_type td
$(nRow).find('td.library_type').click(function(){
open_audio_preview(aData.track_title, aData.audioFile, aData.id);
open_audio_preview(aData.audioFile, aData.id);
return false;
});
@ -360,7 +360,7 @@
//define a play callback.
if (oItems.play !== undefined) {
callback = function() {
open_audio_preview(data.track_title, data.audioFile, data.id);
open_audio_preview(data.audioFile, data.id);
};
oItems.play.callback = callback;
}
@ -638,13 +638,13 @@
var audio_preview_window = null;
function open_audio_preview(name, filename, index) {
url = 'Playlist/audio-preview-player/name/'+name+'/filename/'+filename+'/index/'+index;
function open_audio_preview(fileID, index) {
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})
if (audio_preview_window == null || audio_preview_window.closed){
audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95');
} else if (!audio_preview_window.closed) {
audio_preview_window.play(name, filename);
audio_preview_window.play(fileID);
} else {
console.log("something else : "+baseUrl+url);
}

48
airtime_mvc/public/js/airtime/library/preview_jplayer.js
View file

@ -1,49 +1,11 @@
function audioPreview(filename, elemID){
console.log("in the audio preview");
var elems = $('.ui-icon.ui-icon-pause');
elems.attr("class", "ui-icon ui-icon-play");
if ($("#jquery_jplayer_1").data("jPlayer") && $("#jquery_jplayer_1").data("jPlayer").status.paused != true){
$('#jquery_jplayer_1').jPlayer('stop');
return;
}
var ext = getFileExt(filename);
var uri = "/api/get-media/file/" + filename;
var media;
var supplied;
if (ext == "ogg"){
media = {oga:uri};
supplied = "oga";
} else {
media = {mp3:uri};
supplied = "mp3";
}
$("#jquery_jplayer_1").jPlayer("destroy");
$("#jquery_jplayer_1").jPlayer({
ready: function () {
$(this).jPlayer("setMedia", media).jPlayer("play");
},
swfPath: "/js/jplayer",
supplied: supplied
});
$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
}
$(document).ready(function(){
var filename = $(".filename").text();
var name = $(".name").text();
play(name, filename);
var fileID = $(".fileID").text();
play(fileID);
});
function play(name, filename){
var uri = "/api/get-media/name/"+name+"/filename/" + filename;
var ext = getFileExt(filename);
function play(fileID){
var uri = "/api/get-media/fileID/" + fileID;
var ext = getFileExt(fileID);
var media;

3
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -248,11 +248,10 @@ var AIRTIME = (function(AIRTIME){
function openAudioPreview(event) {
event.stopPropagation();
var name = $(this).parent().find('.spl_title').text();
var audioFile = $(this).attr('audioFile');
var id = "";
open_audio_preview(name, audioFile, id);
open_audio_preview(audioFile, id);
}
function editName() {