diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index fe5634682..f512da0d4 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -76,7 +76,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap //scripts for now playing bar $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/helperfunctions.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/playlist.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/dashboard.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/versiontooltip.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js similarity index 98% rename from airtime_mvc/public/js/airtime/dashboard/playlist.js rename to airtime_mvc/public/js/airtime/dashboard/dashboard.js index 01ee40fd1..0f0adb565 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -27,10 +27,6 @@ var onAirOffIterations = 0; //var timezoneOffset = 0; -//set to "development" if we are developing :). Useful to disable alerts -//when entering production mode. -var APPLICATION_ENV = ""; - /* boolean flag to let us know if we should prepare to execute a function * that flips the playlist to the next song. This flags purpose is to * make sure the function is only executed once*/ @@ -233,9 +229,7 @@ function calcAdditionalShowData(show){ } } -function parseItems(obj){ - APPLICATION_ENV = obj.env; - +function parseItems(obj){ $('#time-zone').text(obj.timezone); previousSong = obj.previous;