diff --git a/widgets/js/jquery.showinfo.js b/widgets/js/jquery.showinfo.js index 8c4e01c2d..b45adb2a4 100644 --- a/widgets/js/jquery.showinfo.js +++ b/widgets/js/jquery.showinfo.js @@ -6,7 +6,7 @@ sourceDomain: "http://localhost/", //where to get show status from text: {onAirToday:"On air today"} }; - var options = $.extend(defaults, options); + var options = $.extend(true, defaults, options); options.sourceDomain = addEndingBackslash(options.sourceDomain); return this.each(function() { @@ -84,7 +84,7 @@ sourceDomain: "http://localhost/", //where to get show status from text: {onAirNow:"On Air Now", offline:"Offline", current:"Current", next:"Next"} }; - var options = $.extend(defaults, options); + options = $.extend(true, defaults, options); options.sourceDomain = addEndingBackslash(options.sourceDomain); return this.each(function() { @@ -162,7 +162,7 @@ dowText: {monday:"Monday", tuesday:"Tuesday", wednesday:"Wednesday", thursday:"Thursday", friday:"Friday", saturday:"Saturday", sunday:"Sunday"}, miscText: {time:"Time", programName:"Program Name", details:"Details", readMore:"Read More"} }; - var options = $.extend(defaults, options); + var options = $.extend(true, defaults, options); options.sourceDomain = addEndingBackslash(options.sourceDomain); return this.each(function() { diff --git a/widgets/sample_page.html b/widgets/sample_page.html index f8c74f7f8..421b3f559 100644 --- a/widgets/sample_page.html +++ b/widgets/sample_page.html @@ -13,24 +13,22 @@ $(document).ready(function() { $("#headerLiveHolder").airtimeLiveInfo({ sourceDomain: "http://airtime-dev.sourcefabric.org", - text: {onAirToday:"On air today"}, + text: {onAirNow:"On air today"}, updatePeriod: 20 //seconds }); -}); -$(document).ready(function() { $("#onAirToday").airtimeShowSchedule({ sourceDomain: "http://airtime-dev.sourcefabric.org", text: {onAirNow:"On Air Now", offline:"Offline", current:"Current", next:"Next"}, updatePeriod: 5 //seconds }); -}); -$(document).ready(function() { $("#scheduleTabs").airtimeWeekSchedule({ sourceDomain:"http://airtime-dev.sourcefabric.org/", dowText:{monday:"Lundi", tuesday:"Mardi", wednesday:"Mercredi", thursday:"Jeudi", friday:"Vendredi", saturday:"Samedi", sunday:"Dimanche"}, miscText:{time:"Temps", programName:"Nom du Programme", details:"Détails", readMore:"Lire La Suite"}, updatePeriod: 600 //seconds }); + $('#scheduleTabs').tabs(); + });