Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Daniel 2012-03-13 14:12:36 -04:00
commit 0b82107d28
1 changed files with 3 additions and 1 deletions

View File

@ -10,7 +10,7 @@ var AIRTIME = (function(AIRTIME) {
var oTable,
historyContentDiv = $("#history_content"),
historyTableDiv = historyContentDiv.find("#history_table"),
tableHeight = historyContentDiv.height() - 140,
tableHeight = historyContentDiv.height() - 200,
fnServerData;
fnServerData = function ( sSource, aoData, fnCallback ) {
@ -70,6 +70,8 @@ var AIRTIME = (function(AIRTIME) {
});
oTable.fnSetFilteringDelay(350);
historyContentDiv.find(".dataTables_scrolling").css("max-height", tableHeight);
return oTable;
};