From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 20 Oct 2013 19:24:56 +0000 (+0200)
Subject: Fixed a few issues with flexible menus
X-Git-Tag: 2.0.0_Beta_11~27^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2f01563ce1275306c94cc28fac4eceed8c30d5d;p=GitHub%2FWoltLab%2FWCF.git

Fixed a few issues with flexible menus
---

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index e6ad479e00..a7333e36a7 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -140,7 +140,6 @@
 		});
 
 		if (jQuery.browser.touch) $('html').addClass('touch');
-		WCF.System.FlexibleMenu.init();
 		new WCF.Date.Time();
 		new WCF.Effect.SmoothScroll();
 		new WCF.Effect.BalloonTooltip();
@@ -150,6 +149,7 @@
 		WCF.System.PageNavigation.init('.pageNavigation');
 		WCF.Date.Picker.init();
 		new WCF.User.ProfilePreview();
+		WCF.System.FlexibleMenu.init();
 		
 		{event name='javascriptInit'}
 		
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 0f921d9052..3842b6799e 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -5943,7 +5943,7 @@ WCF.System.FlexibleMenu = {
 		this._containerIDs.push(containerID);
 		this._containers[containerID] = $container;
 		this._menuItems[containerID] = $container.find('> ul:eq(0) > li');
-		this._dropdowns[containerID] = $('<li class="dropdown"><a class="icon icon16 icon-list" /></li>').data('containerID', containerID).hide().appendTo($container.children('ul')).click($.proxy(this._click, this));
+		this._dropdowns[containerID] = $('<li class="dropdown"><a class="icon icon16 icon-list" /></li>').data('containerID', containerID).hide().appendTo($container.children('ul:eq(0)')).click($.proxy(this._click, this));
 		this._dropdownMenus[containerID] = $('<ul class="dropdownMenu" />').appendTo(this._dropdowns[containerID]);
 		this._hasHiddenItems[containerID] = false;
 		
@@ -6833,13 +6833,13 @@ WCF.Upload = Class.extend({
 	_name: '__files[]',
 	
 	/**
-	 * button object
+	 * button selector
 	 * @var	jQuery
 	 */
 	_buttonSelector: null,
 	
 	/**
-	 * file list object
+	 * file list selector
 	 * @var	jQuery
 	 */
 	_fileListSelector: null,
@@ -6895,8 +6895,8 @@ WCF.Upload = Class.extend({
 	/**
 	 * Initializes a new upload handler.
 	 * 
-	 * @param	jQuery		buttonSelector		button object, not button selector!
-	 * @param	jQuery		fileListSelector	file list object, not file list selector!
+	 * @param	string		buttonSelector
+	 * @param	string		fileListSelector
 	 * @param	string		className
 	 * @param	object		options
 	 */
diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 8fd11dd155..7e659f3eff 100644
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -362,9 +362,11 @@
 				}
 			}
 			
-			&.active > a {
+			&.active > a,
+			&.active > a:hover {
 				background-color: @wcfNavigationHeaderBackgroundColor;
 				color: @wcfMainMenuActiveColor;
+				font-weight: bold;
 				text-align: center;
 				
 				.textShadow(@wcfNavigationHeaderBackgroundColor);
@@ -390,7 +392,6 @@
 			margin-top: -8px;
 			
 			> a {
-				font-weight: bold;
 				min-width: 80px;
 				padding: 14px 21px 8px;
 			}