Merge branch '2.3.x' into devel

This commit is contained in:
Naomi 2013-02-15 17:05:36 -05:00
commit 542553bbc1
18 changed files with 303 additions and 13049 deletions

View file

@ -86,7 +86,7 @@ AIRTIME = (function(AIRTIME) {
.end();
oTable = $('#show_builder_table').dataTable();
oTable.fnDraw();
//oTable.fnDraw();
}
}
@ -277,12 +277,13 @@ AIRTIME = (function(AIRTIME) {
if (json.update === true) {
oTable.fnDraw();
}
setTimeout(checkScheduleUpdates, 5000);
}
});
}
//check if the timeline view needs updating.
setInterval(checkScheduleUpdates, 5 * 1000); //need refresh in milliseconds
checkScheduleUpdates();
};
mod.onResize = function() {