Small tweaks to tabs, fix merge conflicts in podcast

This commit is contained in:
Duncan Sommerville 2015-09-22 20:19:57 -04:00
parent 3790b0fa81
commit 576a457fdb
2 changed files with 5 additions and 6 deletions

View file

@ -248,13 +248,13 @@ var AIRTIME = (function(AIRTIME){
ScheduleTab.prototype.constructor = ScheduleTab;
/* #####################################################
External Functions
Module Functions
##################################################### */
/**
* Initialize the singleton ScheduleTab object on startup
*/
mod.init = function() {
mod.initScheduleTab = function() {
$scheduleTab = Object.freeze(new ScheduleTab());
};
@ -338,7 +338,9 @@ var AIRTIME = (function(AIRTIME){
}(AIRTIME || {}));
$(document).ready(function() {
// Add text scrolling to tab names
$("#show_builder").textScroll(".tab-name");
AIRTIME.tabs.init();
// Initialize the ScheduleTab
AIRTIME.tabs.initScheduleTab();
});
$(window).resize(AIRTIME.tabs.onResize);