From 99969ff19da4786cc6e018f6aee7cad71e09cb4b Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 17 Sep 2012 11:58:05 -0400
Subject: [PATCH] CC-4445: Timeline: 'Select' dropdown menu should be disabled
 if the button is disabled

-fixed
---
 .../public/js/airtime/showbuilder/builder.js  | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 942bfbf0d..47484c2ce 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -330,28 +330,6 @@ var AIRTIME = (function(AIRTIME){
         $lib = $("#library_content"),
         $sbTable = $sbContent.find('table');
         
-        /*
-         * Icon hover states in the toolbar.
-         */
-        $sbContent.on("mouseenter", "#timeline-select .dropdown-toggle", function(ev) {
-            $el = $(this);
-            
-            if (!$el.hasClass("ui-state-disabled")) {
-                $el.addClass("ui-state-hover");
-                $("#timeline-select .caret").contextMenu(true);
-            }
-            else {
-                $("#timeline-select .caret").contextMenu(false);
-            }       
-        });
-        $sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
-            $el = $(this);
-            
-            if (!$el.hasClass("ui-state-disabled")) {
-                $el.removeClass("ui-state-hover");
-            } 
-        });
-        
         oSchedTable = $sbTable.dataTable( {
             "aoColumns": [
             /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
@@ -1090,6 +1068,29 @@ var AIRTIME = (function(AIRTIME){
             return false;
         });
         
+        /*
+         * Icon hover states in the toolbar.
+         */
+        $sbContent.on("mouseenter", ".btn-group #timeline-select", function(ev) {
+            $el = $(this).parent(),
+            $ch = $el.children('#timeline-select');
+            
+            if ($el.hasClass("ui-state-disabled")) {
+                $ch.attr("disabled", "disabled");
+            }
+            else {
+                $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.
         $.contextMenu({
             selector: '.sb-content table tbody tr:not(.sb-empty, .sb-footer, .sb-header, .sb-record) td:not(.sb-checkbox, .sb-image)',