From 576a457fdb1d9e8a002e87f719f9b2ff318c262f Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 22 Sep 2015 20:19:57 -0400
Subject: [PATCH] Small tweaks to tabs, fix merge conflicts in podcast

---
 airtime_mvc/public/js/airtime/library/podcast.js  | 3 ---
 airtime_mvc/public/js/airtime/showbuilder/tabs.js | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js
index b90e73465..1d7c1cdde 100644
--- a/airtime_mvc/public/js/airtime/library/podcast.js
+++ b/airtime_mvc/public/js/airtime/library/podcast.js
@@ -1,8 +1,6 @@
-
 var AIRTIME = (function (AIRTIME) {
     var mod;
 
-
     if (AIRTIME.podcast === undefined) {
         AIRTIME.podcast = {};
     }
@@ -102,7 +100,6 @@ var AIRTIME = (function (AIRTIME) {
             /* Author */            { "sTitle" : $.i18n._("Author")            , "mDataProp" : "author"         , "sClass" : "podcast_episodes_author"      , "sWidth" : "170px" },
             /* Description */       { "sTitle" : $.i18n._("Description")       , "mDataProp" : "description"    , "sClass" : "podcast_episodes_description" , "sWidth" : "300px" },
             /* Link */              { "sTitle" : $.i18n._("Link")              , "mDataProp" : "link"           , "sClass" : "podcast_episodes_link"        , "sWidth" : "170px" },
-            /* GUID */              { "sTitle" : $.i18n._("GUID")              , "mDataProp" : "guid"           , "sClass" : "podcast_episodes_guid"        , "sWidth" : "170px" },
             /* Publication Date */  { "sTitle" : $.i18n._("Publication Date")  , "mDataProp" : "pubDate"        , "sClass" : "podcast_episodes_pub_date"    , "sWidth" : "170px" }
         ];
 
diff --git a/airtime_mvc/public/js/airtime/showbuilder/tabs.js b/airtime_mvc/public/js/airtime/showbuilder/tabs.js
index 3e6ef9e67..f04680ffb 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/tabs.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/tabs.js
@@ -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);