From 83902ebbbe3bbed7902f1cbfcc0df817005e325c Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 6 Aug 2015 10:40:50 -0400
Subject: [PATCH] Fix small showbuilder bugs

---
 .../library/events/_library_showbuilder.js       |  2 +-
 .../public/js/airtime/showbuilder/_builder.js    | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
index e9bdb704c..87e9b601d 100644
--- a/airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
@@ -197,7 +197,7 @@ var AIRTIME = (function(AIRTIME) {
     function addToCurrentOrNext(arr) {
         var el;
         // Add to the end of the current show by getting the footer
-        el = $(".sb-footer.sb-current-show");
+        el = $(".sb-footer.sb-future:first");
         var data = el.prev().data("aData");
 
         if (data === undefined) {
diff --git a/airtime_mvc/public/js/airtime/showbuilder/_builder.js b/airtime_mvc/public/js/airtime/showbuilder/_builder.js
index 9c65bc767..9f13de4c3 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/_builder.js
@@ -13,6 +13,7 @@ var AIRTIME = (function(AIRTIME){
         showInstanceIds = [],
         headerFooter = [],
         DISABLED_CLASS = 'ui-state-disabled',
+        selected,
         $previouslySelected;
 
     if (AIRTIME.showbuilder === undefined) {
@@ -280,9 +281,10 @@ var AIRTIME = (function(AIRTIME){
         checkError(json);
 
         mod.getSelectedCursors();
+        selected = $(".sb-selected");
         oSchedTable.fnDraw();
-
         mod.enableUI();
+
         //Unneccessary reload of the library pane after moving tracks in the showbuilder pane.
         //$("#library_content").find("#library_display").dataTable().fnStandingRedraw();
 
@@ -343,7 +345,7 @@ var AIRTIME = (function(AIRTIME){
                 {"items": aItems, "format": "json"},
                 mod.fnItemCallback
             );
-        }else{
+        } else {
             mod.enableUI();
         }
     };
@@ -468,7 +470,7 @@ var AIRTIME = (function(AIRTIME){
                 //sure everything works properly.
                 for (i = 0, length = a.length; i < length; i++) {
                     if (typeof(a[i]) === "string") {
-                        a[i] = (a[i] === "true") ? true : false;
+                        a[i] = (a[i] === "true");
                     }
                 }
 
@@ -733,6 +735,14 @@ var AIRTIME = (function(AIRTIME){
 
 
                 mod.checkToolBarIcons();
+
+                var sid;
+                if (selected !== undefined) {
+                    selected.each(function (i, el) {
+                        sid = $(el).attr("id");
+                        $("#" + sid).addClass(SB_SELECTED_CLASS);
+                    });
+                }
             },
 
             // R = ColReorder, C = ColVis