From 95f97ccc557ca151c1f8013ceac3f26b37746abe Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 23 Mar 2012 18:27:47 +0100
Subject: [PATCH 1/3] CC-3463 : Usability improvements for timeline

---
 airtime_mvc/public/js/airtime/showbuilder/builder.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 8974e87e1..bc049a555 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -422,7 +422,7 @@ var AIRTIME = (function(AIRTIME){
 				if (tr.length > 0) {
 					//enable deleting of overbooked tracks.
 					AIRTIME.button.enableButton("sb-button-trim");
-				}	
+				}
 		    },
 			"fnHeaderCallback": function(nHead) {
 				$(nHead).find("input[type=checkbox]").attr("checked", false);
@@ -732,11 +732,15 @@ var AIRTIME = (function(AIRTIME){
 		//set things like a reference to the table.
 		AIRTIME.showbuilder.init(oTable);
 		
-		//add event to cursors.
-		$sbTable.find("tbody").on("click", "div.marker", function(event){
+		//add events to cursors.
+		$sbTable.find("tbody").on("click", "div.marker", function(event) {
 			var tr = $(this).parents("tr"),
 				cursorSelClass = "cursor-selected-row";
 			
+			if (event.ctrlKey === false) {
+				$sbTable.find('.'+cursorSelClass).removeClass(cursorSelClass);
+			}
+			
 			if (tr.hasClass(cursorSelClass)) {
 				tr.removeClass(cursorSelClass);
 			}
@@ -746,7 +750,7 @@ var AIRTIME = (function(AIRTIME){
 			
 			//check if add button can still be enabled.
 			AIRTIME.library.events.enableAddButtonCheck();
-			
+
 			return false;
 		});
 		

From 2f287274f6aa29f7f810a3649e949219ff5d6883 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 23 Mar 2012 18:33:40 +0100
Subject: [PATCH 2/3] CC-3463 : timeline usability

---
 .../js/airtime/library/events/library_playlistbuilder.js      | 4 ++--
 .../public/js/airtime/library/events/library_showbuilder.js   | 4 ++--
 2 files changed, 4 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 e03ee9e07..860758b2b 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -82,8 +82,8 @@ var AIRTIME = (function(AIRTIME){
 		$toolbar
 			.append("<ul />")
 			.find('ul')
-				.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add selected items to playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
-				.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected items"><span class="ui-icon ui-icon-trash"></span></li>');
+				.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add selected files to playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
+				.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected files"><span class="ui-icon ui-icon-trash"></span></li>');
 		
 		//add to playlist button
 		$toolbar.find('.lib-button-add')
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 2845a6d32..6f5a4648c 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -82,8 +82,8 @@ var AIRTIME = (function(AIRTIME){
 		$toolbar
 			.append("<ul />")
 			.find('ul')
-				.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add selected items to playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
-				.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected items"><span class="ui-icon ui-icon-trash"></span></li>');
+				.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add files after cursor points"><span class="ui-icon ui-icon-plusthick"></span></li>')
+				.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected files"><span class="ui-icon ui-icon-trash"></span></li>');
 		
 		//add to timeline button
 		$toolbar.find('.lib-button-add')

From ac9fc9f66539c0334d1e6648e7a0cec7d646dc6e Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 23 Mar 2012 18:54:03 +0100
Subject: [PATCH 3/3] CC-3436 : timeline usability

---
 .../public/js/airtime/showbuilder/builder.js   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index bc049a555..30295efdc 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -734,18 +734,20 @@ var AIRTIME = (function(AIRTIME){
 		
 		//add events to cursors.
 		$sbTable.find("tbody").on("click", "div.marker", function(event) {
-			var tr = $(this).parents("tr"),
+			var $tr = $(this).parents("tr"),
 				cursorSelClass = "cursor-selected-row";
 			
-			if (event.ctrlKey === false) {
-				$sbTable.find('.'+cursorSelClass).removeClass(cursorSelClass);
-			}
-			
-			if (tr.hasClass(cursorSelClass)) {
-				tr.removeClass(cursorSelClass);
+			if ($tr.hasClass(cursorSelClass)) {
+				$tr.removeClass(cursorSelClass);
 			}
 			else {
-				tr.addClass(cursorSelClass);
+				$tr.addClass(cursorSelClass);
+			}
+			
+			if (event.ctrlKey === false) {
+				$sbTable.find('.'+cursorSelClass)
+					.not($tr)
+					.removeClass(cursorSelClass);
 			}
 			
 			//check if add button can still be enabled.