From 0b44db954f4920b3816b489f3c7273fe6506c758 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 31 Jul 2011 01:25:33 +0200
Subject: [PATCH] dont show play and add-to-playlist at the same time
---
apps/media/js/music.js | 35 +++++++++++++++++++----------------
apps/media/js/player.js | 9 ++++++++-
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index a9e10b3d40..6c8c564431 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -24,22 +24,25 @@ $(document).ready(function(){
data[itemParts[0]]=decodeURIComponent(itemParts[1]).replace(/\+/g,' ');
}
var media=Collection.find(data.artist,data.album,data.song);
- var button=$('<input type="button" class="play"></input>');
- button.css('background-image','url('+OC.imagePath('core','actions/play')+')')
- button.click(function(){
- var oldSize=PlayList.items.length;
- PlayList.add(media);
- PlayList.play(oldSize);
- PlayList.render();
- });
- row.find('div.name').append(button);
- var button=$('<input type="button" class="add"></input>');
- button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
- button.click(function(){
- PlayList.add(media);
- PlayList.render();
- });
- row.find('div.name').append(button);
+ if(!PlayList.playing()){
+ var button=$('<input type="button" class="play"></input>');
+ button.css('background-image','url('+OC.imagePath('core','actions/play')+')')
+ button.click(function(){
+ var oldSize=PlayList.items.length;
+ PlayList.add(media);
+ PlayList.play(oldSize);
+ PlayList.render();
+ });
+ row.find('div.name').append(button);
+ }else{
+ var button=$('<input type="button" class="add"></input>');
+ button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
+ button.click(function(){
+ PlayList.add(media);
+ PlayList.render();
+ });
+ row.find('div.name').append(button);
+ }
}
});
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 2e910bc0d5..ebb8044598 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -104,5 +104,12 @@ var PlayList={
PlayList.items.splice(index,1);
PlayList.render();
},
- render:function(){}
+ render:function(){},
+ playing:function(){
+ if(!PlayList.player){
+ return false;
+ }else{
+ return !PlayList.player.data("jPlayer").status.paused;
+ }
+ }
}
--
GitLab