Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Daniel 2012-03-13 14:12:36 -04:00
parent 927e5033c8 dff0265e55
commit 0b82107d28
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/playouthistory/historytable.js
View File

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