From 226a3ffbeaa42b580b01ad989e6d74291a3021c1 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Sun, 5 Feb 2012 18:46:52 +0100
Subject: [PATCH] CC-3174 : showbuilder/lib refact

add button now functional for playlist,
still need to enable/disable when appropriate.
---
 .../library/events/library_playlistbuilder.js | 23 +++++++++++++++++--
 .../library/events/library_showbuilder.js     | 10 ++++----
 .../public/js/airtime/library/library.js      |  2 +-
 3 files changed, 27 insertions(+), 8 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 3da7be438..ab4118934 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -43,20 +43,39 @@ var AIRTIME = (function(AIRTIME){
 	 */
 	mod.setupLibraryToolbar = function( oLibTable ) {
 		var aButtons,
-			fnResetCol;
+			fnResetCol,
+			fnAddSelectedItems;
 		
 		fnResetCol = function () {
 			ColReorder.fnReset( oLibTable );
 			return false;
 		};
 		
+		fnAddSelectedItems = function() {
+			var oLibTT = TableTools.fnGetInstance('library_display'),
+				aData = oLibTT.fnGetSelectedData(),
+				item,
+				temp,
+				aMediaIds = [];
+			
+			//process selected files/playlists.
+			for (item in aData) {
+				temp = aData[item];
+				if (temp !== null && temp.hasOwnProperty('id') && temp.ftype === "audioclip") {
+					aMediaIds.push(temp.id);
+				} 	
+			}
+		
+			AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
+		};
+		
 		//[0] = button text
 		//[1] = id 
 		//[2] = enabled
 		//[3] = click event
 		aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], 
 		                ["Delete", "library_group_delete", true], 
-		                ["Add", "library_group_add", true]];
+		                ["Add", "library_group_add", true, fnAddSelectedItems]];
 		
 		addToolBarButtonsLibrary(aButtons);
 	}
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 d37d6aca1..ec9cc1d1f 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -41,14 +41,14 @@ var AIRTIME = (function(AIRTIME){
 		};
 		
 		fnAddSelectedItems = function() {
-			var aData = oLibTT.fnGetSelectedData(),
+			var oSchedTable = $("#show_builder_table").dataTable(),
+				oLibTT = TableTools.fnGetInstance('library_display'),
+				oSchedTT = TableTools.fnGetInstance('show_builder_table'),
+				aData = oLibTT.fnGetSelectedData(),
 				item,
 				temp,
 				aMediaIds = [],
-				aSchedIds = [],
-				oSchedTable = $("#show_builder_table").dataTable(),
-				oLibTT = TableTools.fnGetInstance('library_display'),
-				oSchedTT = TableTools.fnGetInstance('show_builder_table');;
+				aSchedIds = [];
 			
 			//process selected files/playlists.
 			for (item in aData) {
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 33cc15f5d..e800aaed1 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -347,7 +347,7 @@ $(document).ready(function() {
     addQtipToSCIcons();
     
     $.contextMenu({
-        selector: 'td:not(.library_checkbox):not(.library_type)',
+        selector: '#library_display td:not(.library_checkbox):not(.library_type)',
         trigger: "left",
         ignoreRightClick: true,