Merge branch '2.3.x'

This commit is contained in:
Martin Konecny 2013-04-11 15:06:21 -04:00
commit 3714f83757
33 changed files with 47694 additions and 47574 deletions

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;
}