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

-rename playlists.js to dashboard.js

This commit is contained in:
Martin Konecny 2012-05-08 20:41:09 -04:00
parent 55312e9538
commit 6c4bb1ef9e
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/Bootstrap.php
View File

@ -76,7 +76,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
//scripts for now playing bar //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/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'); $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/versiontooltip.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

8
airtime_mvc/public/js/airtime/dashboard/playlist.js → airtime_mvc/public/js/airtime/dashboard/dashboard.js
View File

@ -27,10 +27,6 @@ var onAirOffIterations = 0;
//var timezoneOffset = 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 /* 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 * that flips the playlist to the next song. This flags purpose is to
* make sure the function is only executed once*/ * make sure the function is only executed once*/
@ -233,9 +229,7 @@ function calcAdditionalShowData(show){
} }
} }
function parseItems(obj){ function parseItems(obj){
APPLICATION_ENV = obj.env;
$('#time-zone').text(obj.timezone); $('#time-zone').text(obj.timezone);
previousSong = obj.previous; previousSong = obj.previous;