Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
b3420984e2
|
@ -51,8 +51,6 @@ var AIRTIME = (function(AIRTIME) {
|
||||||
$trs;
|
$trs;
|
||||||
|
|
||||||
|
|
||||||
// TODO : hack, get rid of this crap library
|
|
||||||
if (!$libTable) { return ; }
|
|
||||||
// Get visible items and check if any chosenItems are visible
|
// Get visible items and check if any chosenItems are visible
|
||||||
$trs = $libTable.find("tbody input:checkbox").parents("tr");
|
$trs = $libTable.find("tbody input:checkbox").parents("tr");
|
||||||
$trs.each(function(i){
|
$trs.each(function(i){
|
||||||
|
@ -363,6 +361,8 @@ var AIRTIME = (function(AIRTIME) {
|
||||||
var tableHeight = $libContent.height() - 130;
|
var tableHeight = $libContent.height() - 130;
|
||||||
|
|
||||||
function setColumnFilter(oTable){
|
function setColumnFilter(oTable){
|
||||||
|
// TODO : remove this dirty hack once js is refactored
|
||||||
|
if (!oTable.fnSettings()) { return ; }
|
||||||
var aoCols = oTable.fnSettings().aoColumns;
|
var aoCols = oTable.fnSettings().aoColumns;
|
||||||
var colsForAdvancedSearch = new Array();
|
var colsForAdvancedSearch = new Array();
|
||||||
var advanceSearchDiv = $("div#advanced_search");
|
var advanceSearchDiv = $("div#advanced_search");
|
||||||
|
@ -653,7 +653,6 @@ var AIRTIME = (function(AIRTIME) {
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
setColumnFilter(oTable);
|
|
||||||
oTable.fnSetFilteringDelay(350);
|
oTable.fnSetFilteringDelay(350);
|
||||||
|
|
||||||
$libContent.on("click", "legend", function(){
|
$libContent.on("click", "legend", function(){
|
||||||
|
|
Loading…
Reference in New Issue