add play button to collection overview to add songs to the playlist and play them...

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 5aa0d058bdca5e7f4e60edc56ff1852822379673..b8fd515ba60517527f4e687869ab88750da8db2a 100644 (file)
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -53,10 +53,9 @@ Collection={
                                        li.data('artist',artist);
                                        li.removeClass('template');
                                        li.addClass('artist');
+                                       li.data('type','artist');
                                        li.children('span').text(artist.artist_name);
-                                       li.children('button').click(function(){
-                                               PlayList.add($(this).parent().data('artist'));
-                                       })
+                                       Collection.addButtons(li);
                                        Collection.parent.append(li);
                                }
                        }
@@ -81,10 +80,9 @@ Collection={
                                li.removeClass('template');
                                li.addClass('album');
                                li.data('album',album);
+                               li.data('type','album');
                                li.children('span').text(album.album_name);
-                               li.children('button').click(function(){
-                                       PlayList.add($(this).parent().data('album'));
-                               })
+                               Collection.addButtons(li);
                                ul.append(li);
                        }
                        artistLi.append(ul);
@@ -102,10 +100,9 @@ Collection={
                        li.removeClass('template');
                        li.addClass('song');
                        li.data('song',song);
+                       li.data('type','song');
                        li.children('span').text(song.song_name);
-                       li.children('button').click(function(){
-                               PlayList.add($(this).parent().data('song'));
-                       })
+                       Collection.addButtons(li);
                        ul.append(li);
                }
                albumLi.append(ul);
@@ -124,6 +121,18 @@ Collection={
                                }
                        }
                }
+       },
+       addButtons:function(parent){
+               parent.children('button.add').click(function(){
+                       var type=$(this).parent().data('type');
+                       PlayList.add($(this).parent().data(type));
+               });
+               parent.children('button.play').click(function(){
+                       var type=$(this).parent().data('type');
+                       var oldSize=PlayList.items.length;
+                       PlayList.add($(this).parent().data(type));
+                       PlayList.play(oldSize);
+               });
        }
 }
 

diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php
index e132eeae07a3d2eeab54d0856700fe6ecf540af0..e2c256a6480346e95e6ad8bb12072cde288d1ec2 100644 (file)
--- a/apps/media/templates/collection.php
+++ b/apps/media/templates/collection.php
@@ -4,6 +4,7 @@
        </li>
        <li class='template'>
                <span></span>
-               <button>Add</button>
+               <button class='add'>Add</button>
+               <button class='play'>Play</button>
        </li>
 </ul>
\ No newline at end of file