[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [owncloud] apps/media: make the persitent playlist work anywhere
From:       Robin Appelman <icewind1991 () gmail ! com>
Date:       2011-08-01 0:00:03
Message-ID: 20110801000003.37D6CA60AE () git ! kde ! org
[Download RAW message or body]

Git commit 1933426e3eef35ff55b2c5ed494012cbfe637e10 by Robin Appelman.
Committed on 01/08/2011 at 01:20.
Pushed by rappelman into branch 'master'.

make the persitent playlist work anywhere

M  +1    -3    apps/media/appinfo/app.php
R  +6    -4    apps/media/js/loader.js [from: apps/media/js/files.js - 083% similarity]

http://commits.kde.org/owncloud/1933426e3eef35ff55b2c5ed494012cbfe637e10

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index b29b842..20c5868 100644
--- 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/loader.js
similarity index 83%
rename from apps/media/js/files.js
rename to apps/media/js/loader.js
index 79741e1..b2a306b 100644
--- a/apps/media/js/files.js
+++ b/apps/media/js/loader.js
@@ -43,10 +43,12 @@ $(document).ready(function() {
 // 	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 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();


[prev in list] [next in list] [prev in thread] [next in thread]