make the persitent playlist work anywhere

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index b29b842d23a2eaaebf9fa6e16ed62962f9f16599..20c58689f09b8fd2755a575d2f25513d6836ccb6 100644 (file)
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -22,9 +22,7 @@
 
 require_once('apps/media/lib_media.php');
 
-if(OC_App::getCurrentApp()=='files'){
-       OC_Util::addScript('media','files');
-}
+OC_Util::addScript('media','loader');
 
 OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 

diff --git a/apps/media/js/files.js b/apps/media/js/files.js
deleted file mode 100644 (file)
index 79741e1..0000000
--- a/apps/media/js/files.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function musicTypeFromFile(file){
-       var extention=file.substr(file.indexOf('.')+1);
-       if(extention=='ogg'){
-               return 'oga'
-       }
-       //TODO check for more specific cases
-       return extention;
-}
-
-function playAudio(filename){
-       loadPlayer(musicTypeFromFile(filename),function(){
-               PlayList.add($('#dir').val()+'/'+filename);
-               PlayList.play(PlayList.items.length-1);
-       });
-}
-
-function addAudio(filename){
-       loadPlayer(musicTypeFromFile(filename),function(){
-               PlayList.add($('#dir').val()+'/'+filename);
-       });
-}
-
-function loadPlayer(type,ready){
-       if(!loadPlayer.done){
-               OC.addScript('media','jquery.jplayer.min',function(){
-                       OC.addScript('media','player',function(){
-                               $('body').append($('<div id="playerPlaceholder"/>'))
-                               $('#playerPlaceholder').append($('<div/>')).load(OC.filePath('media','templates','player.php'),function(){
-                                       loadPlayer.done=true;
-                                       PlayList.init(type,ready);
-                               });
-                       });
-               });
-               OC.addStyle('media','player');
-       }else{
-               ready();
-       }
-}
-
-$(document).ready(function() {
-       loadPlayer.done=false
-
-//     FileActions.register('audio','Add to playlist','',addAudio);
-//     FileActions.register('application/ogg','Add to playlist','',addAudio);
-
-       FileActions.register('audio','Play','',playAudio);
-       FileActions.register('application/ogg','','Play',playAudio);
-       FileActions.setDefault('audio','Play');
-       FileActions.setDefault('application/ogg','Play');
-       if(typeof localStorage !== 'undefined'){
-               if(localStorage.hasOwnProperty('oc_playlist_items')){
-                       loadPlayer();
-               }
-       }
-});
\ No newline at end of file

diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
new file mode 100644 (file)
index 0000000..b2a306b
--- /dev/null
+++ b/apps/media/js/loader.js
@@ -0,0 +1,57 @@
+function musicTypeFromFile(file){
+       var extention=file.substr(file.indexOf('.')+1);
+       if(extention=='ogg'){
+               return 'oga'
+       }
+       //TODO check for more specific cases
+       return extention;
+}
+
+function playAudio(filename){
+       loadPlayer(musicTypeFromFile(filename),function(){
+               PlayList.add($('#dir').val()+'/'+filename);
+               PlayList.play(PlayList.items.length-1);
+       });
+}
+
+function addAudio(filename){
+       loadPlayer(musicTypeFromFile(filename),function(){
+               PlayList.add($('#dir').val()+'/'+filename);
+       });
+}
+
+function loadPlayer(type,ready){
+       if(!loadPlayer.done){
+               OC.addScript('media','jquery.jplayer.min',function(){
+                       OC.addScript('media','player',function(){
+                               $('body').append($('<div id="playerPlaceholder"/>'))
+                               $('#playerPlaceholder').append($('<div/>')).load(OC.filePath('media','templates','player.php'),function(){
+                                       loadPlayer.done=true;
+                                       PlayList.init(type,ready);
+                               });
+                       });
+               });
+               OC.addStyle('media','player');
+       }else{
+               ready();
+       }
+}
+
+$(document).ready(function() {
+       loadPlayer.done=false
+
+//     FileActions.register('audio','Add to playlist','',addAudio);
+//     FileActions.register('application/ogg','Add to playlist','',addAudio);
+
+       if(typeof FileActions!=='undefined'){
+               FileActions.register('audio','Play','',playAudio);
+               FileActions.register('application/ogg','','Play',playAudio);
+               FileActions.setDefault('audio','Play');
+               FileActions.setDefault('application/ogg','Play');
+       }
+       if(typeof localStorage !== 'undefined'){
+               if(localStorage.hasOwnProperty('oc_playlist_items')){
+                       loadPlayer();
+               }
+       }
+});
\ No newline at end of file