From 5bea867bec9f0cb901fbd5dec9b9293950bb7b94 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 18 Apr 2012 19:02:29 -0400 Subject: [PATCH] CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. -fixed --- .../application/controllers/AudiopreviewController.php | 8 ++++---- .../{jplayer => airtime/audiopreview}/preview_jplayer.js | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename airtime_mvc/public/js/{jplayer => airtime/audiopreview}/preview_jplayer.js (100%) diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index 9ebd1be42..8203adade 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -28,7 +28,7 @@ class AudiopreviewController extends Zend_Controller_Action $baseDir = dirname($_SERVER['SCRIPT_FILENAME']); - $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/preview_jplayer.js?'.filemtime($baseDir.'/js/jplayer/preview_jplayer.js'),'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/audiopreview/preview_jplayer.js?'.filemtime($baseDir.'/js/audiopreview/preview_jplayer.js'),'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jplayer.playlist.min.js?'.filemtime($baseDir.'/js/jplayer/jplayer.playlist.min.js'),'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.audio-preview.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.audio-preview.blue.monday.css')); $this->_helper->layout->setLayout('audioPlayer'); @@ -60,7 +60,7 @@ class AudiopreviewController extends Zend_Controller_Action $baseDir = dirname($_SERVER['SCRIPT_FILENAME']); - $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/preview_jplayer.js?'.filemtime($baseDir.'/js/jplayer/preview_jplayer.js'),'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/audiopreview/preview_jplayer.js?'.filemtime($baseDir.'/js/audiopreview/preview_jplayer.js'),'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jplayer.playlist.min.js?'.filemtime($baseDir.'/js/jplayer/jplayer.playlist.min.js'),'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.audio-preview.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.audio-preview.blue.monday.css')); $this->_helper->layout->setLayout('audioPlayer'); @@ -129,7 +129,7 @@ class AudiopreviewController extends Zend_Controller_Action $baseDir = dirname($_SERVER['SCRIPT_FILENAME']); - $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/preview_jplayer.js?'.filemtime($baseDir.'/js/jplayer/preview_jplayer.js'),'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/audiopreview/preview_jplayer.js?'.filemtime($baseDir.'/js/audiopreview/preview_jplayer.js'),'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jplayer.playlist.min.js?'.filemtime($baseDir.'/js/jplayer/jplayer.playlist.min.js'),'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.audio-preview.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.audio-preview.blue.monday.css')); $this->_helper->layout->setLayout('audioPlayer'); @@ -188,4 +188,4 @@ class AudiopreviewController extends Zend_Controller_Action $this->_helper->json($result); } -} \ No newline at end of file +} diff --git a/airtime_mvc/public/js/jplayer/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js similarity index 100% rename from airtime_mvc/public/js/jplayer/preview_jplayer.js rename to airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js