Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/public/js/airtime/library/library.js

airtime_mvc/public/js/airtime/library/library.js

@@ -160,7 +160,7 @@ var AIRTIME = (function(AIRTIME) {
                 
                 //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 @@ var AIRTIME = (function(AIRTIME) {
                     //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,20 +638,16 @@ function addQtipToSCIcons(){
     
 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);
     }
 
-    //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;
+}

airtime_mvc/public/js/airtime/library/preview_jplayer.js

@@ -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;

airtime_mvc/public/js/airtime/library/spl.js

@@ -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() {

airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css

@@ -89,12 +89,10 @@ div.jp-video div.jp-interface {
 }
 
 /* Used to hide the filename field **/
-span.filename {
-    display:none; 
-}
-span.name {
+span.fileID {
     display:none; 
 }
+
 /* @group CONTROLS */
 
 div.jp-controls-holder {