Merge commit 'upstream/ui-rf'

1 files changed, 46 insertions, 23 deletions

diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js
index 7b6d534..8155e2f 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.js
+++ b/debug_toolbar/media/debug_toolbar/toolbar.js
@@ -14,14 +14,13 @@ jQuery(function($j) {
 				current = $j('#djDebug #' + this.className);
 				if (current.is(':visible')) {
 				    $j(document).trigger('close.djDebug');
-					$j(this).parent().removeClass("active");
+					$j(this).parent().removeClass('active');
 				} else {
-					//$j('.panelContent').hide();
-					$j(document).trigger('close.djDebug');
+					$j('.panelContent').hide(); // Hide any that are already open
 					current.show();
 					$j.djDebug.open();
-					$j('#djDebugToolbar li').removeClass("active");
-					$j(this).parent().addClass("active");
+					$j('#djDebugToolbar li').removeClass('active');
+					$j(this).parent().addClass('active');
 				}
 				return false;
 			});
@@ -59,15 +58,11 @@ jQuery(function($j) {
 			if ($j.cookie(COOKIE_NAME)) {
 				$j.djDebug.hide_toolbar(false);
 			} else {
-				$j('#djDebugToolbar').show();
+				$j.djDebug.show_toolbar(false);
 			}
 		},
 		open: function() {
-			$j(document).bind('keydown.djDebug', function(e) {
-				if (e.keyCode == 27) {
-					$j.djDebug.close();
-				}
-			});
+			// TODO: Decide if we should remove this
 		},
 		toggle_content: function(elem) {
 			if (elem.is(':visible')) {
@@ -81,10 +76,16 @@ jQuery(function($j) {
 			return false;
 		},
 		hide_toolbar: function(setCookie) {
-		    $j(document).trigger('close.djDebug');
-			$j('#djDebugToolbar').hide("fast");
-			$j('#djDebugToolbar li').removeClass("active");
+			// close any sub panels
+			$j('#djDebugWindow').hide();
+			// close all panels
+			$j('.panelContent').hide();
+			$j('#djDebugToolbar li').removeClass('active');
+			// finally close toolbar
+			$j('#djDebugToolbar').hide('fast');
 			$j('#djDebugToolbarHandle').show();
+			// Unbind keydown
+			$j(document).unbind('keydown.djDebug');
 			if (setCookie) {
 				$j.cookie(COOKIE_NAME, 'hide', {
 					path: '/',
@@ -92,24 +93,46 @@ jQuery(function($j) {
 				});
 			}
 		},
-		show_toolbar: function() {
+		show_toolbar: function(animate) {
+			// Set up keybindings
+			$j(document).bind('keydown.djDebug', function(e) {
+				if (e.keyCode == 27) {
+					$j.djDebug.close();
+				}
+			});
 			$j('#djDebugToolbarHandle').hide();
-			$j('#djDebugToolbar').show("fast");
+			if (animate) {
+				$j('#djDebugToolbar').show('fast');
+			} else {
+				$j('#djDebugToolbar').show();
+			}
 			$j.cookie(COOKIE_NAME, null, {
 				path: '/',
 				expires: -1
 			});
 		},
 		toggle_arrow: function(elem) {
-            var uarr = String.fromCharCode(0x25b6);
-            var darr = String.fromCharCode(0x25bc);
-            elem.html(elem.html() == uarr ? darr : uarr);
-        }
+			var uarr = String.fromCharCode(0x25b6);
+			var darr = String.fromCharCode(0x25bc);
+			elem.html(elem.html() == uarr ? darr : uarr);
+		}
 	});
 	$j(document).bind('close.djDebug', function() {
-		$j(document).unbind('keydown.djDebug');
-		$j('.panelContent').hide()
-		$j('#djDebugToolbar li').removeClass("active");
+		// If a sub-panel is open, close that
+		if ($j('#djDebugWindow').is(':visible')) {
+			$j('#djDebugWindow').hide();
+			return;
+		}
+		// If a panel is open, close that
+		if ($j('.panelContent').is(':visible')) {
+			$j('.panelContent').hide();
+			return;
+		}
+		// Otherwise, just minimize the toolbar
+		if ($j('#djDebugToolbar').is(':visible')) {
+			$j.djDebug.hide_toolbar(true);
+			return;
+		}
 	});
 });
 jQuery(function() {