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

CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)

Browse source 
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
This commit is contained in:
Daniel 2012-03-05 18:59:31 -05:00
parent a246f85a5b
commit a09b63b8d0
12 changed files with 49 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -29,7 +29,7 @@ class PlaylistController extends Zend_Controller_Action
{
$pl = null;
if (isset($this->pl_sess->id)) {
if (isset($this->pl_sess->id)) {
$pl = new Application_Model_Playlist($this->pl_sess->id);
$modified = $this->_getParam('modified', null);
@ -112,7 +112,6 @@ class PlaylistController extends Zend_Controller_Action
$baseUrl = $request->getBaseUrl();
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/preview.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
$this->_helper->viewRenderer->setResponseSegment('spl');
@ -199,8 +198,7 @@ class PlaylistController extends Zend_Controller_Action
public function audioPreviewPlayerAction()
{
Logging::log("PlaylistControler::in the play action");
$name = $this->_getParam('name');
$fileName = $this->_getParam('filename');
$playlistIndex = $this->_getParam('index');
@ -219,6 +217,8 @@ class PlaylistController extends Zend_Controller_Action
} else {
$this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
}
$this->view->name = $name;
$this->view->fileName = $fileName;
$this->view->playlistIndex= $playlistIndex;
}