From e7367c3374f0582e13a9658bfe33aba75fcbd9d4 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 18 Aug 2015 18:01:12 -0400
Subject: [PATCH] Fix more selection bugs

---
 airtime_mvc/public/js/airtime/library/library.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 201f9efba..675f7fc39 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -292,7 +292,7 @@ var AIRTIME = (function(AIRTIME) {
 
     mod.uncheckItem = function($el) {
         $el.find(".library_checkbox > input").prop('checked', false);
-        if ($("." + LIB_SELECTED_CLASS.length == 0)) {
+        if ($("." + LIB_SELECTED_CLASS).length == 0) {
             $("#super-checkbox").prop("checked", false);
         }
     };
@@ -308,6 +308,7 @@ var AIRTIME = (function(AIRTIME) {
     mod.selectItem = function($el) {
         mod.highlightItem($el);
         mod.addToChosen($el);
+        mod.checkItem($el);
         // Remember this row so we can properly multiselect
         $previouslySelected = $el;
 
@@ -317,6 +318,7 @@ var AIRTIME = (function(AIRTIME) {
     mod.deselectItem = function($el) {
         mod.unHighlightItem($el);
         mod.removeFromChosen($el);
+        mod.uncheckItem($el);
         mod.checkToolBarIcons();
     };
 
@@ -324,6 +326,7 @@ var AIRTIME = (function(AIRTIME) {
         $els.each(function(i, el){
             mod.highlightItem($(el));
             mod.addToChosen($(el));
+            mod.checkItem($(el));
         });
         $previouslySelected = $els.last();
         mod.checkToolBarIcons();
@@ -862,17 +865,14 @@ var AIRTIME = (function(AIRTIME) {
                     if ($previouslySelected.prevAll("#" + $rowId).length !== 0) {
                         $previouslySelected.prevUntil($tr).each(function (i, el) {
                             mod.selectItem($(el));
-                            mod.checkItem($(el));
                         });
                     } else {
                         $previouslySelected.nextUntil($tr).each(function (i, el) {
                             mod.selectItem($(el));
-                            mod.checkItem($(el));
                         });
                     }
                 }
                 mod.selectItem($tr);
-                mod.checkItem($tr);
             } else {
                 flagForDeselection = true;
             }
@@ -894,12 +894,10 @@ var AIRTIME = (function(AIRTIME) {
                     if ($previouslySelected.prevAll("#" + $rowId).length !== 0) {
                         $previouslySelected.prevUntil($tr).each(function (i, el) {
                             mod.selectItem($(el));
-                            mod.checkItem($(el));
                         });
                     } else {
                         $previouslySelected.nextUntil($tr).each(function (i, el) {
                             mod.selectItem($(el));
-                            mod.checkItem($(el));
                         });
                     }
                 } else if (!ev.ctrlKey) {
@@ -907,7 +905,6 @@ var AIRTIME = (function(AIRTIME) {
                 }
 
                 mod.selectItem($tr);
-                mod.checkItem($tr);
             } else if (ev.ctrlKey) {
                 mod.deselectItem($tr);
             }
@@ -915,11 +912,9 @@ var AIRTIME = (function(AIRTIME) {
 
         $libTable.find("tbody").on("click", "tr > td.library_checkbox", function() {
             var tr = $(this).parent();
-
             if (flagForDeselection) {
                 flagForDeselection = false;
                 mod.deselectItem(tr);
-                mod.uncheckItem(tr);
             } else {
                 mod.checkItem(tr);
             }
@@ -931,7 +926,6 @@ var AIRTIME = (function(AIRTIME) {
                 mod.selectNone();
                 mod.selectItem(tr);
             }
-            mod.checkItem(tr);
         });
 
         $libTable.find("thead").on("click", "th > input[type='checkbox']", function() {