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

Small tweaks to tabs, fix merge conflicts in podcast

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/public/js/airtime/library/podcast.js
View file

@ -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" }
];

8
airtime_mvc/public/js/airtime/showbuilder/tabs.js
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);