From 576c13963d3ffc595a11d4617609be51666749b4 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 26 Jun 2012 17:35:07 -0400
Subject: [PATCH 1/2] CC-3998: Now Playing -> Time Line: confirm message for
 user 'delete' track by context menu is misleading

- fixed
---
 airtime_mvc/public/js/airtime/showbuilder/builder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 0ea7b943d..88b49eb8f 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -1088,7 +1088,7 @@ var AIRTIME = (function(AIRTIME){
                     if (oItems.del !== undefined) {
                         
                         callback = function() {
-                            if (confirm("Delete selected Items?")) {
+                            if (confirm("Delete selected item?")) {
                                 AIRTIME.showbuilder.fnRemove([{
                                     id: data.id,
                                     timestamp: data.timestamp,

From 31d643cee1a16cc2f62fb057e3efd0f79a91a8d9 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 26 Jun 2012 17:43:15 -0400
Subject: [PATCH 2/2] CC-3997: Now Playing -> Time Line: different behaviour
 between 'delete' button and 'delete' menu items

- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
---
 .../public/js/airtime/library/library.js      | 30 ++++++++++---------
 .../public/js/airtime/showbuilder/builder.js  | 13 ++++----
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index a05445629..5e286fbc9 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -252,20 +252,22 @@ var AIRTIME = (function(AIRTIME) {
     };
     
     mod.fnDeleteSelectedItems = function() {
-        var aData = AIRTIME.library.getSelectedData(),
-            item,
-            temp,
-            aMedia = [];
-        
-        //process selected files/playlists.
-        for (item in aData) {
-            temp = aData[item];
-            if (temp !== null && temp.hasOwnProperty('id') ) {
-                aMedia.push({"id": temp.id, "type": temp.ftype});
-            }   
-        }
-    
-        AIRTIME.library.fnDeleteItems(aMedia);
+    	if (confirm('Are you sure you want to delete the selected item(s)?')) {
+	        var aData = AIRTIME.library.getSelectedData(),
+	            item,
+	            temp,
+	            aMedia = [];
+	        
+	        //process selected files/playlists.
+	        for (item in aData) {
+	            temp = aData[item];
+	            if (temp !== null && temp.hasOwnProperty('id') ) {
+	                aMedia.push({"id": temp.id, "type": temp.ftype});
+	            }   
+	        }
+	    
+	        AIRTIME.library.fnDeleteItems(aMedia);
+    	}
     };
     
     libraryInit = function() {
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 88b49eb8f..c4a58cc07 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -243,11 +243,14 @@ var AIRTIME = (function(AIRTIME){
     mod.fnRemove = function(aItems) {
         
         mod.disableUI();
-        
-        $.post( "/showbuilder/schedule-remove",
-            {"items": aItems, "format": "json"},
-            mod.fnItemCallback
-        );
+        if (confirm("Delete selected item(s)?")) {
+	        $.post( "/showbuilder/schedule-remove",
+	            {"items": aItems, "format": "json"},
+	            mod.fnItemCallback
+	        );
+        }else{
+        	mod.enableUI();
+        }
     };
     
     mod.fnRemoveSelectedItems = function() {