diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index bffe64a23..73dbd210d 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -47,9 +47,7 @@ var AIRTIME = (function(AIRTIME){ $('#library_display tr.lib-audio').draggable({ helper: function(){ - - mod.addToChosen($(this)); - + var selected = mod.getChosenAudioFilesLength(), container, message, @@ -57,8 +55,8 @@ var AIRTIME = (function(AIRTIME){ width = li.width(), height = li.height(); - if (selected === 1) { - message = "Adding "+selected+" Item."; + if (selected === 0 || selected === 1) { + message = "Adding 1 Item."; } else { message = "Adding "+selected+" Items."; diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index a4e938308..58e4b4453 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -48,8 +48,6 @@ var AIRTIME = (function(AIRTIME){ $('#library_display tr.lib-audio, tr.lib-pl').draggable({ helper: function(){ - mod.addToChosen($(this)); - var selected = mod.getChosenItemsLength(), container, thead = $("#show_builder_table thead"), @@ -57,8 +55,8 @@ var AIRTIME = (function(AIRTIME){ width = thead.find("tr:first").width(), message; - if (selected === 1) { - message = "Adding "+selected+" Item."; + if (selected === 0 || selected === 1) { + message = "Adding 1 Item."; } else { message = "Adding "+selected+" Items."; diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 61c2e42fd..99d5265b0 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -522,6 +522,8 @@ var AIRTIME = (function(AIRTIME){ i, length; + AIRTIME.library.addToChosen(ui.item); + //filter out anything that isn't an audiofile. aSelected = AIRTIME.library.getSelectedData(); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index b22a04b2f..212416e9f 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -697,6 +697,8 @@ var AIRTIME = (function(AIRTIME){ fnReceive = function(event, ui) { var aItems = []; + + AIRTIME.library.addToChosen(ui.item); aItems = AIRTIME.library.getSelectedData(); origTrs = aItems;