diff --git a/ui/js-boxed/list.js b/ui/js-boxed/list.js index 2101e0055bafb9021b5d5089503e4804b1ff1be4..3d614a6407c8f71ed7d0b4b598b86abcf4d4d42c 100644 --- a/ui/js-boxed/list.js +++ b/ui/js-boxed/list.js @@ -58,7 +58,16 @@ $.widget('djrandom.songbox', $.djrandom.songlist, { click(function() { $('.playlist li', box).remove(); })); - box.append($('<a/>').addClass('btn action-appendall').text('Append all')); + var appendall = $('<a/>').addClass('btn action-appendall').text('Append all'); + box.append(appendall); + appendall.click(function() { + var slist = $(box).songbox('option', 'parentlist'); + if(slist !== null) { + $(box).songbox('getSongs').each(function(i, song) { + slist.songlist('addSong', song); + }); + } + }); box.append($('<a/>').addClass('btn action-nextall').text('Play all as next song')); this._super(); }, diff --git a/ui/js-boxed/ui.js b/ui/js-boxed/ui.js index 9203f34e353e7f54e5b5c6e264f558025423d448..c00a96ad6010e4cbebc4f3d6b23d2c5d838af95d 100644 --- a/ui/js-boxed/ui.js +++ b/ui/js-boxed/ui.js @@ -69,13 +69,8 @@ jQuery(function($) { $(this).addClass('sorted'); } }); - $('#resultsBox').songbox(); - $('#suggestionsBox').songbox(); - $('.songbox').on('click', '.action-appendall', function() { - $(this).parent(':djrandom-songbox, :djrandom-songlist').songlist('getSongs').map(function(idx, song) { - $('#playing').songlist('addSong', song); - }); - }) + $('#resultsBox').songbox({parentlist: $('#playing')}); + $('#suggestionsBox').songbox({parentlist: $('#playing')}); $('.songlist .playlist').on('click', '.action-suggest', function() { songel = $(this).parent('li'); suggest_in_box([songel.data('song').id]);