From dcddec9536026d21b39f26ff4e74a9b3b888fcee Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Mon, 4 Jul 2011 14:49:17 -0400
Subject: [PATCH] CC-2447:Preview keeps playing if you create a new playlist

- fixed
- preview stops on clicking on any of new, delete, done editing button
---
 .../public/js/airtime/dashboard/helperfunctions.js       | 7 +------
 airtime_mvc/public/js/airtime/library/spl.js             | 9 +++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
index cdd2eb931..dcd1503cc 100644
--- a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
+++ b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
@@ -141,19 +141,14 @@ function getFileExt(filename){
     return filename.split('.').pop();
 }
 
-var currentAudioPreviewID = "";
-
 function audioPreview(filename, elemID){
 
     var elems = $('.ui-icon.ui-icon-pause');
     elems.attr("class", "ui-icon ui-icon-play");
 
-    if (currentAudioPreviewID == elemID){
+    if ($("#jquery_jplayer_1").data("jPlayer") && $("#jquery_jplayer_1").data("jPlayer").status.paused != true){
          $('#jquery_jplayer_1').jPlayer('stop');
-        currentAudioPreviewID = "";
         return;
-    } else {
-        currentAudioPreviewID = elemID;
     }
 
     var ext = getFileExt(filename);
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 85a3f8288..bba0ffb58 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -337,6 +337,9 @@ function noOpenPL(json) {
 
 function closeSPL() {
 	var url;
+	
+	// stop playing any preview
+	$('#jquery_jplayer_1').jPlayer('stop');
 
 	url = '/Playlist/close/format/json';
 
@@ -386,6 +389,9 @@ function createPlaylistMetaForm(json) {
 function newSPL() {
 	var url;
 
+	// stop any preview playing
+	$('#jquery_jplayer_1').jPlayer('stop');
+	
 	url = '/Playlist/new/format/json';
 
 	$.post(url, createPlaylistMetaForm);
@@ -394,6 +400,9 @@ function newSPL() {
 function deleteSPL() {
 	var url;
 
+	// stop any preview playing
+	$('#jquery_jplayer_1').jPlayer('stop');
+	
 	url = '/Playlist/delete-active/format/json';
 
 	$.post(url, function(){