From 574d6e8e28c5a840dd2931436d7326e99ec2b693 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 29 Jan 2013 15:00:49 -0500
Subject: [PATCH] Simple zIndex rather than fancy stack works best.

---
 cms/static/js/base.js     | 6 +++---
 cms/static/js/hesitate.js | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index fe43fe2d71..41c1ee3cdb 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -87,7 +87,7 @@ $(document).ready(function() {
     $('.unit').draggable({
     	axis: 'y',
     	handle: '.drag-handle',
-    	stack: '.unit, .id-holder',  
+    	zIndex: 999,  
     	start: initiateHesitate,
     	drag: checkHoverState,
     	stop: removeHesitate,
@@ -98,7 +98,7 @@ $(document).ready(function() {
     $('.id-holder').draggable({
     	axis: 'y',
     	handle: '.section-item .drag-handle',
-    	stack: '.id-holder',
+    	zIndex: 999,  
     	start: initiateHesitate,
     	drag: checkHoverState,
     	stop: removeHesitate,
@@ -339,7 +339,7 @@ function removeHesitate(event, ui) {
 function expandSection(event) {
 	$(event.delegateTarget).removeClass('collapsed', 400); 
 	// don't descend to icon's on children (which aren't under first child) only to this element's icon
-	$(event.delegateTarget).children().first().find('.expand-collapse-icon').removeClass('expand', 400).addClass('collapse', 400);
+	$(event.delegateTarget).children().first().find('.expand-collapse-icon').removeClass('expand', 400).addClass('collapse');
 }
 
 function onUnitReordered(event, ui) {
diff --git a/cms/static/js/hesitate.js b/cms/static/js/hesitate.js
index a261f036e6..c5848a6c0c 100644
--- a/cms/static/js/hesitate.js
+++ b/cms/static/js/hesitate.js
@@ -18,7 +18,7 @@ CMS.HesitateEvent = function(executeOnTimeOut, cancelSelector, onlyOnce) {
 	this.timeoutEventId = null;
 	this.originalEvent = null;
 	this.onlyOnce = (onlyOnce === true);
-}
+};
 
 CMS.HesitateEvent.DURATION = 800;
 
@@ -28,17 +28,16 @@ CMS.HesitateEvent.prototype.trigger = function(event) {
 				function() { event.data.fireEvent(event); }, 
 				CMS.HesitateEvent.DURATION);
 		event.data.originalEvent = event;
-		// is it wrong to bind to the below v $(event.currentTarget)?
 		$(event.data.originalEvent.delegateTarget).on(event.data.cancelSelector, event.data, event.data.untrigger);
 	}
-}
+};
 
 CMS.HesitateEvent.prototype.fireEvent = function(event) {
 	event.data.timeoutEventId = null;
 	$(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger);
 	if (event.data.onlyOnce) $(event.data.originalEvent.delegateTarget).off(event.data.originalEvent.type, event.data.trigger);
 	event.data.executeOnTimeOut(event.data.originalEvent);
-}
+};
 
 CMS.HesitateEvent.prototype.untrigger = function(event) {
 	if (event.data.timeoutEventId) {
@@ -46,4 +45,4 @@ CMS.HesitateEvent.prototype.untrigger = function(event) {
 		$(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger);
 	}
 	event.data.timeoutEventId = null;
-}
\ No newline at end of file
+};
\ No newline at end of file