From 51f004933b6022732728c015979f6ceb7c110ac1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 1 Mar 2012 18:27:10 -0500 Subject: [PATCH] CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) - updated icon in library --- airtime_mvc/application/models/StoredFile.php | 4 +++- airtime_mvc/public/js/airtime/library/preview_jplayer.js | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 7c541a45c..184870d73 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -661,7 +661,9 @@ Logging::log("getting media! - 2"); if($type == "au" && isset( $audioResults )) { $audioFile = $audioResults[$row['id']-1]['gunid'].".".pathinfo($audioResults[$row['id']-1]['filepath'], PATHINFO_EXTENSION); - $row['image'] = ''; + $row['image'] = ' + '; } else { diff --git a/airtime_mvc/public/js/airtime/library/preview_jplayer.js b/airtime_mvc/public/js/airtime/library/preview_jplayer.js index ed48c6328..7141e1a45 100644 --- a/airtime_mvc/public/js/airtime/library/preview_jplayer.js +++ b/airtime_mvc/public/js/airtime/library/preview_jplayer.js @@ -41,8 +41,6 @@ $(document).ready(function(){ }); function play(filename){ - console.log("in the play function! "+filename); - var uri = "/api/get-media/file/" + filename; var ext = getFileExt(filename); @@ -69,5 +67,6 @@ function play(filename){ cssSelectorAncestor: '#jp_container_1', wmode: "window" }); + $this.focus(); }