From f5e03db9feccacecb1631bce9d4173be5b214d27 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 24 May 2013 11:23:08 -0400
Subject: [PATCH] CC-5108 : Waveform Editor UI

making sure the correct li is activated when a track has a decoding error.
---
 airtime_mvc/public/js/airtime/library/spl.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 1dcba9039..60799ff42 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -209,12 +209,11 @@ var AIRTIME = (function(AIRTIME){
     }
     
     /* used from waveform pop-up */
-    function changeCrossfade($el, id1, id2, fadeIn, fadeOut, offset) {
+    function changeCrossfade($el, id1, id2, fadeIn, fadeOut, offset, id) {
         
         var url = baseUrl+"Playlist/set-crossfade",
             lastMod = getModified(),
-            type = $('#obj_type').val(),
-            li, id;
+            type = $('#obj_type').val();
         
         $.post(url, 
             {format: "json", fadeIn: fadeIn, fadeOut: fadeOut, id1: id1, id2: id2, offset: offset, modified: lastMod, type: type}, 
@@ -230,10 +229,9 @@ var AIRTIME = (function(AIRTIME){
                 
                 setPlaylistContent(json);
 
-                id = id1 === undefined ? id2 : id1;
-                li = $('#side_playlist li[unqid='+id+']');
-                li.find('.crossfade').toggle();
-                highlightActive(li.find('.spl_fade_control'));
+                $li = $('#side_playlist li[unqid='+id+']');
+                $li.find('.crossfade').toggle();
+                highlightActive($li.find('.spl_fade_control'));
             });
     }
 
@@ -1179,13 +1177,16 @@ var AIRTIME = (function(AIRTIME){
 	mod.showFadesWaveform = function(e) {
 		var $el = $(e.target),
 			$parent = $el.parents("dl"),
+			$li = $el.parents("li"),
 			$fadeOut = $parent.find(".spl_fade_out"),
 			$fadeIn = $parent.find(".spl_fade_in"),
 			$html = $($("#tmpl-pl-fades").html()),
 			tracks = [],
 			dim = AIRTIME.utilities.findViewportDimensions(),
 			playlistEditor,
-			id1, id2;
+			id1, id2,
+			id = $li.attr("unqid");
+		
 		
 		function removeDialog() {
 			playlistEditor.stop();
@@ -1284,7 +1285,7 @@ var AIRTIME = (function(AIRTIME){
                 	fadeIn = (fadeIn === undefined) ? undefined : fadeIn.toFixed(1);
                 	fadeOut = (fadeOut === undefined) ? undefined : fadeOut.toFixed(1);
                 	
-                	changeCrossfade($html, id1, id2, fadeIn, fadeOut, offset);
+                	changeCrossfade($html, id1, id2, fadeIn, fadeOut, offset, id);
                 }}
             ],
             open: function (event, ui) {