From bf614dd729d0be35843739e46601e7b98ec55806 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 23 May 2012 17:40:56 +0200
Subject: [PATCH] CC-3870 : Now playing -> "Add n items" displays wrong "n"
 when drag and drop tracks to Time Line

---
 .../airtime/library/events/library_playlistbuilder.js  | 10 ++++++++--
 .../js/airtime/library/events/library_showbuilder.js   | 10 ++++++++--
 airtime_mvc/public/js/airtime/library/library.js       |  7 +++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

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 73dbd210d..249af5d55 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -48,14 +48,20 @@ var AIRTIME = (function(AIRTIME){
 		$('#library_display tr.lib-audio').draggable({
 			helper: function(){
 					
-			    var selected = mod.getChosenAudioFilesLength(),
+			    var $el = $(this),
+			    	selected = mod.getChosenAudioFilesLength(),
 			    	container,
 			    	message,
 			    	li = $("#side_playlist ul li:first"),
 			    	width = li.width(),
 			    	height = li.height();
+			    
+			    //dragging an element that has an unselected checkbox.
+			    if (mod.isChosenItem($el) === false) {
+			    	selected++;
+			    }
 			   
-			    if (selected === 0 || selected === 1) {
+			    if (selected === 1) {
 			    	message = "Adding 1 Item.";
 			    }
 			    else {
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 58e4b4453..7d841c56d 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -48,14 +48,20 @@ var AIRTIME = (function(AIRTIME){
 		$('#library_display tr.lib-audio, tr.lib-pl').draggable({
 			helper: function(){
 				
-			    var selected = mod.getChosenItemsLength(),
+			    var $el = $(this),
+			    	selected = mod.getChosenItemsLength(),
 			    	container,
 			    	thead = $("#show_builder_table thead"),
 			    	colspan = thead.find("th").length,
 			    	width = thead.find("tr:first").width(),
 			    	message;
 			    
-			    if (selected === 0 || selected === 1) {
+			    //dragging an element that has an unselected checkbox.
+			    if (mod.isChosenItem($el) === false) {
+			    	selected++;
+			    }
+			    
+			    if (selected === 1) {
 			    	message = "Adding 1 Item.";
 			    }
 			    else {
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 401eb041e..c5e1b7495 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -98,6 +98,13 @@ var AIRTIME = (function(AIRTIME) {
     	}
     };
     
+    mod.isChosenItem = function($el) {
+    	var id = $el.attr("id"),
+    		item = chosenItems[id];
+
+    	return item !== undefined ? true : false;
+    };
+    
     mod.addToChosen = function($el) {
     	var id = $el.attr("id");