From de225c589f716ba34b386e9d681720879513cc12 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 30 Aug 2013 02:31:23 -0400 Subject: [PATCH] restricting search properly for select all/none. --- .../js/airtime/playouthistory/historytable.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js index c1d5ac6f0..8b43be9b0 100644 --- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js +++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js @@ -91,8 +91,9 @@ var AIRTIME = (function(AIRTIME) { selectedLogItems = {}; } - function selectCurrentPage() { - var $inputs = $historyContentDiv.find(".his_checkbox").find("input"), + function selectCurrentPage(e) { + var $ctx = $(e.currentTarget).parents("div.dataTables_wrapper"), + $inputs = $ctx.find(".his_checkbox").find("input"), $tr, $input; @@ -104,8 +105,9 @@ var AIRTIME = (function(AIRTIME) { }); } - function deselectCurrentPage() { - var $inputs = $historyContentDiv.find(".his_checkbox").find("input"), + function deselectCurrentPage(e) { + var $ctx = $(e.currentTarget).parents("div.dataTables_wrapper"), + $inputs = $ctx.find(".his_checkbox").find("input"), $tr, $input; @@ -430,7 +432,7 @@ var AIRTIME = (function(AIRTIME) { }, always: function() { inShowsTab = false; - selectedLogItems = {}; + emptySelectedLogItems(); } }, { @@ -443,7 +445,7 @@ var AIRTIME = (function(AIRTIME) { }, always: function() { inShowsTab = false; - selectedLogItems = {}; + emptySelectedLogItems(); } }, { @@ -457,7 +459,7 @@ var AIRTIME = (function(AIRTIME) { always: function() { inShowsTab = true; showSummaryList(); - selectedLogItems = {}; + emptySelectedLogItems(); } } ];