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

Merge branch '2.3.x' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-04-11 15:05:08 -04:00
commit a65be248bd
33 changed files with 47694 additions and 47574 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -42,7 +42,9 @@ var AIRTIME = (function(AIRTIME){
mod.updateCalendarStatusIcon = function(json) {
if (window.location.pathname.toLowerCase() != baseUrl+"schedule") {
//make sure we are only executing this code on the calendar view, not
//the Now Playing view.
if (window.location.pathname.toLowerCase().indexOf("schedule") >= 0) {
return;
}