mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only load the music player outside the media app if the media app isnt already open in another tab

This commit is contained in:
Robin Appelman 2011-08-04 01:19:21 +02:00
parent e209511f86
commit 93b342ee39
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/media/js/loader.js
View File

@ -51,7 +51,7 @@ $(document).ready(function() {
} }
if(typeof PlayList==='undefined'){ if(typeof PlayList==='undefined'){
if(typeof localStorage !== 'undefined'){ if(typeof localStorage !== 'undefined'){
if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]'){ if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
loadPlayer(); loadPlayer();
} }
} }

28
apps/media/js/player.js
View File

@ -4,6 +4,7 @@ var PlayList={
items:[], items:[],
player:null, player:null,
volume:0.8, volume:0.8,
active:false,
next:function(){ next:function(){
var next=PlayList.current+1; var next=PlayList.current+1;
if(next>=PlayList.items.length){ if(next>=PlayList.items.length){
@ -34,7 +35,6 @@ var PlayList={
PlayList.player.jPlayer("setMedia", PlayList.items[PlayList.current]); PlayList.player.jPlayer("setMedia", PlayList.items[PlayList.current]);
PlayList.items[index].playcount++; PlayList.items[index].playcount++;
PlayList.player.jPlayer("play",time); PlayList.player.jPlayer("play",time);
localStorage.setItem(oc_current_user+'oc_playlist_current',index);
if(index>0){ if(index>0){
var previous=index-1; var previous=index-1;
}else{ }else{
@ -83,14 +83,6 @@ var PlayList={
play:function(){ play:function(){
localStorage.setItem(oc_current_user+'oc_playlist_playing','true'); localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
}, },
timeupdate:function(){
var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
localStorage.setItem(oc_current_user+'oc_playlist_time',time);
},
volumechange:function(){
var volume=PlayList.player.data('jPlayer').options.volume*100;
localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
},
supplied:type, supplied:type,
ready:function(){ ready:function(){
PlayList.load(); PlayList.load();
@ -126,7 +118,6 @@ var PlayList={
item[type]=PlayList.urlBase+encodeURIComponent(song.song_path); item[type]=PlayList.urlBase+encodeURIComponent(song.song_path);
PlayList.items.push(item); PlayList.items.push(item);
} }
PlayList.save();
}, },
addFile:function(path){ addFile:function(path){
var type=musicTypeFromFile(path); var type=musicTypeFromFile(path);
@ -142,7 +133,6 @@ var PlayList={
remove:function(index){ remove:function(index){
PlayList.items.splice(index,1); PlayList.items.splice(index,1);
PlayList.render(); PlayList.render();
PlayList.save();
}, },
render:function(){}, render:function(){},
playing:function(){ playing:function(){
@ -155,10 +145,20 @@ var PlayList={
save:function(){ save:function(){
if(typeof localStorage !== 'undefined'){ if(typeof localStorage !== 'undefined'){
localStorage.setItem(oc_current_user+'oc_playlist_items',JSON.stringify(PlayList.items)); localStorage.setItem(oc_current_user+'oc_playlist_items',JSON.stringify(PlayList.items));
localStorage.setItem(oc_current_user+'oc_playlist_current',PlayList.current);
var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
localStorage.setItem(oc_current_user+'oc_playlist_time',time);
var volume=PlayList.player.data('jPlayer').options.volume*100;
localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
if(PlayList.active){
localStorage.setItem(oc_current_user+'oc_playlist_active','false');
}
} }
}, },
load:function(){ load:function(){
if(typeof localStorage !== 'undefined'){ if(typeof localStorage !== 'undefined'){
PlayList.active=true;
localStorage.setItem(oc_current_user+'oc_playlist_active','true');
if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){ if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){
PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items')); PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items'));
if(PlayList.items.length>0){ if(PlayList.items.length>0){
@ -185,3 +185,9 @@ var PlayList={
} }
} }
} }
$(document).ready(function(){
$(window).bind('beforeunload', function (){
PlayList.save();
});
})