From e30d3b770cdef550c12dd406b1429b65ef867dfc Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 17 Sep 2012 12:19:02 -0400 Subject: [PATCH 1/3] -removed unused code --- airtime_mvc/public/js/airtime/showbuilder/builder.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 444f10e6e..b51a88ce7 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -1087,13 +1087,6 @@ var AIRTIME = (function(AIRTIME){ $ch.removeAttr("disabled"); } }); - $sbContent.on("mouseleave", ".btn-group #timeline-select", function(ev) { - $el = $(this).parent(); - - if (!$el.hasClass("ui-state-disabled")) { - $el.removeClass("ui-state-hover"); - } - }); //begin context menu initialization. From b8b3bfb495c3574fa9098255786ed66a9bd38349 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 17 Sep 2012 12:23:49 -0400 Subject: [PATCH 2/3] CC-4450: Now Playing -> Can't remove overbooked tracks -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 b51a88ce7..4b6f45b07 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -1023,7 +1023,7 @@ var AIRTIME = (function(AIRTIME){ }); //delete overbooked tracks. - $toolbar.find('.icon-cut') + $toolbar.find('.icon-cut').parent() .click(function() { if (AIRTIME.button.isDisabled('icon-cut') === true) { From f02bf04a25e0acb87acd84ce4f131242bb27ac44 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 17 Sep 2012 12:27:17 -0400 Subject: [PATCH 3/3] CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work -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 4b6f45b07..e18c61548 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -1043,7 +1043,7 @@ var AIRTIME = (function(AIRTIME){ }); //delete selected tracks - $toolbar.find('.icon-trash') + $toolbar.find('.icon-trash').parent() .click(function() { if (AIRTIME.button.isDisabled('icon-trash') === true) {