summaryrefslogtreecommitdiffstats
path: root/apps/media/js/loader.js
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-09-28 22:20:26 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-09-28 22:21:06 +0200
commit1639a1ca49aef77cb1b58364fb928a63fa4a99a0 (patch)
treed0e54590554533113ffba44c818a1def6e5c674a /apps/media/js/loader.js
parentc39c6d36df259980a1f804b4c4cc384640b8cf55 (diff)
downloadnextcloud-server-1639a1ca49aef77cb1b58364fb928a63fa4a99a0.tar.gz
nextcloud-server-1639a1ca49aef77cb1b58364fb928a63fa4a99a0.zip
fix persistent playlist for media player
Diffstat (limited to 'apps/media/js/loader.js')
-rw-r--r--apps/media/js/loader.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index c6c834d3a31..dff4163897f 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -22,16 +22,17 @@ function addAudio(filename){
function loadPlayer(type,ready){
if(!loadPlayer.done){
+ loadPlayer.done=true;
+ OC.addStyle('media','player');
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;
+ var navItem=$('#apps a[href="'+OC.linkTo('media','index.php')+'"]');
+ navItem.height(navItem.height());
+ navItem.load(OC.filePath('media','templates','player.php'),function(){
PlayList.init(type,ready);
});
});
});
- OC.addStyle('media','player');
}else{
ready();
}