summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-08-12 22:28:35 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-08-13 00:23:15 +0200
commit382834ec2b395ceba21d1eb5a753a73df9141104 (patch)
tree3a0fb2c02bf104297d00a858e27a7a0fda3d5a92 /apps
parent686be824b520e4f04e634846b415e82ed9fb1c4d (diff)
downloadnextcloud-server-382834ec2b395ceba21d1eb5a753a73df9141104.tar.gz
nextcloud-server-382834ec2b395ceba21d1eb5a753a73df9141104.zip
highlight playing songs in collection
Diffstat (limited to 'apps')
-rw-r--r--apps/media/css/music.css3
-rw-r--r--apps/media/js/collection.js15
2 files changed, 13 insertions, 5 deletions
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index c78ab200719..f9c3b955d6c 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -12,4 +12,5 @@ li button.right.prettybutton{font-size:1em;}
#collection li{padding-right:10px;}
#searchresults input.play, #searchresults input.add{float:right; height:16px; width:16px;}
#collection tr.collapsed td.album, #collection tr.collapsed td.title{color:#ddd}
-a.expander{float:right;display:block}
+a.expander{ float:right; display:block; }
+tr.active { background-color:#ccc; }
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 95398f8397a..8ef10951b6b 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -62,12 +62,16 @@ Collection={
event.preventDefault();
PlayList.add(song,true);
PlayList.play(0);
+ Collection.parent.find('tr').removeClass('active');
+ tr.addClass('active');
});
if(artist.artist_name!=lastArtist){
tr.find('td.artist a').click(function(event){
event.preventDefault();
PlayList.add(artist,true);
PlayList.play(0);
+ Collection.parent.find('tr').removeClass('active');
+ $('tr[data-artist="'+artist.artist_name+'"]').addClass('active');
});
tr.find('td.artist a').text(artist.artist_name);
if(artist.albums.length>1){
@@ -89,6 +93,8 @@ Collection={
event.preventDefault();
PlayList.add(album,true);
PlayList.play(0);
+ Collection.parent.find('tr').removeClass('active');
+ $('tr[data-album="'+album.album_name+'"]').addClass('active');
});
tr.find('td.album a').text(album.album_name);
if(album.songs.length>1){
@@ -149,10 +155,11 @@ Collection={
Collection.parent.hide();
}
},
- registerPlay:function(){
- var item=PlayList.items[PlayList.current];
- var song=Collection.findSong(item.artist,item.album,item.name);
- song.song_playcount++;
+ registerPlay:function(item){
+ if(item){
+ var song=Collection.findSong(item.artist,item.album,item.name);
+ song.song_playcount++;
+ }
},
addButtons:function(parent){
parent.children('button.add').click(function(){