From 2acce7b6324e8baa5b67c8749aae77248f717ddb Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 14 Feb 2012 21:45:38 +0100
Subject: [PATCH] MINOR Moved menu-specific panel logic in LeftAndMain.Menu.js
 to avoid weakening base library

---
 admin/javascript/LeftAndMain.Menu.js  | 64 +++++++++++++++++++++++++++
 admin/javascript/LeftAndMain.Panel.js | 62 --------------------------
 2 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/admin/javascript/LeftAndMain.Menu.js b/admin/javascript/LeftAndMain.Menu.js
index d052c8b8d..35a04951a 100644
--- a/admin/javascript/LeftAndMain.Menu.js
+++ b/admin/javascript/LeftAndMain.Menu.js
@@ -26,6 +26,54 @@
 		 * Custom Events:
 		 * - 'select': Fires when a menu item is selected (on any level).
 		 */
+		$('.cms-panel.cms-menu').entwine({
+			togglePanel: function(bool) {
+				//apply or unapply the flyout formatting, should only apply to cms-menu-list when the current collapsed panal is the cms menu.
+				$('.cms-menu-list').children('li').each(function(){
+					if (bool) { //expand
+						$(this).children('ul').each(function() {
+							$(this).removeClass('collapsed-flyout');
+							if ($(this).data('collapse')) {
+								$(this).removeData('collapse');
+								$(this).addClass('collapse');
+							}
+						});
+					} else {    //collapse
+						$(this).children('ul').each(function() {
+							$(this).addClass('collapsed-flyout');
+							$(this).hasClass('collapse');
+							$(this).removeClass('collapse');
+							$(this).data('collapse', true);
+						});
+					}
+				});
+
+				this.toggleFlyoutState(bool);					
+
+				this._super(bool);
+			},
+			toggleFlyoutState: function(bool) {
+				if (bool) { //expand
+					//show the flyout
+					$('.collapsed').find('li').show();
+
+					//hide all the flyout-indicator
+					$('.cms-menu-list').find('.child-flyout-indicator').hide();
+				} else {    //collapse
+					//hide the flyout only if it is not the current section
+					$('.collapsed-flyout').find('li').each(function() {
+						//if (!$(this).hasClass('current'))
+						$(this).hide();
+					});
+
+					//show all the flyout-indicators
+					var par = $('.cms-menu-list ul.collapsed-flyout').parent();
+					if (par.children('.child-flyout-indicator').length == 0) par.append('<span class="child-flyout-indicator"></span>').fadeIn();
+					par.children('.child-flyout-indicator').fadeIn();
+				}
+			},
+		});
+
 		$('.cms-menu-list').entwine({
 			onmatch: function() {
 				var self = this;
@@ -73,6 +121,22 @@
 				}
 			}
 		});
+
+		/** Toggle the flyout panel to appear/disappear when mouse over */
+		$('.cms-menu-list li').entwine({
+			toggleFlyout: function(bool) {
+				fly = $(this);
+				if (fly.children('ul').first().hasClass('collapsed-flyout')) {
+					if (bool) { //expand
+						fly.children('ul').find('li').fadeIn('fast');
+					} else {    //collapse
+						fly.children('ul').find('li').hide();
+					}
+				}
+			}
+		});
+		//slight delay to prevent flyout closing from "sloppy mouse movement"
+		$('.cms-menu-list li').hoverIntent(function(){$(this).toggleFlyout(true);},function(){$(this).toggleFlyout(false);});
 		
 		$('.cms-menu-list .toggle').entwine({
 			onclick: function(e) {
diff --git a/admin/javascript/LeftAndMain.Panel.js b/admin/javascript/LeftAndMain.Panel.js
index 1adaef9b9..65975128f 100644
--- a/admin/javascript/LeftAndMain.Panel.js
+++ b/admin/javascript/LeftAndMain.Panel.js
@@ -69,52 +69,7 @@
 				}
 			},
 
-			toggleFlyoutState: function(bool) {
-				if (bool) { //expand
-					//show the flyout
-					$('.collapsed').find('li').show();
-
-					//hide all the flyout-indicator
-					$('.cms-menu-list').find('.child-flyout-indicator').hide();
-				} else {    //collapse
-					//hide the flyout only if it is not the current section
-					$('.collapsed-flyout').find('li').each(function() {
-						//if (!$(this).hasClass('current'))
-						$(this).hide();
-					});
-
-					//show all the flyout-indicators
-					var par = $('.cms-menu-list ul.collapsed-flyout').parent();
-					if (par.children('.child-flyout-indicator').length == 0) par.append('<span class="child-flyout-indicator"></span>').fadeIn();
-					par.children('.child-flyout-indicator').fadeIn();
-				}
-			},
-			
 			togglePanel: function(bool) {
-
-				//apply or unapply the flyout formatting, should only apply to cms-menu-list when the current collapsed panal is the cms menu.
-				if($(this).attr('id') == 'cms-menu'){
-					$('.cms-menu-list').children('li').each(function(){
-						if (bool) { //expand
-							$(this).children('ul').each(function() {
-								$(this).removeClass('collapsed-flyout');
-								if ($(this).data('collapse')) {
-									$(this).removeData('collapse');
-									$(this).addClass('collapse');
-								}
-							});
-						} else {    //collapse
-							$(this).children('ul').each(function() {
-								$(this).addClass('collapsed-flyout');
-								$(this).hasClass('collapse');
-								$(this).removeClass('collapse');
-								$(this).data('collapse', true);
-							});
-						}
-					});
-
-					this.toggleFlyoutState(bool);					
-				}
 				this.toggleClass('collapsed', !bool);
 				var newWidth = bool ? this.getWidthExpanded() : this.getWidthCollapsed();
 				
@@ -148,23 +103,6 @@
 				this.togglePanel(false);
 			}
 		});
-
-		/** Toggle the flyout panel to appear/disappear when mouse over */
-		$('.cms-menu-list li').entwine({
-			toggleFlyout: function(bool) {
-				fly = $(this);
-				if (fly.children('ul').first().hasClass('collapsed-flyout')) {
-					if (bool) { //expand
-						fly.children('ul').find('li').fadeIn('fast');
-					} else {    //collapse
-						fly.children('ul').find('li').hide();
-					}
-				}
-			}
-		});
-		//slight delay to prevent flyout closing from "sloppy mouse movement"
-		$('.cms-menu-list li').hoverIntent(function(){$(this).toggleFlyout(true);},function(){$(this).toggleFlyout(false);});
-
 		
 		$('.cms-panel *').entwine({
 			getPanel: function() {