Fixed a few issues with flexible menus

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index e6ad479e0077ac9bb570f2784404659f067855dc..a7333e36a7548c997834e52b55803e2652581bee 100644 (file)
--- 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 0f921d9052331d80d7b70ab3be58c3f5aa81c19d..3842b6799e407c6778338cf6e5dfcdd88c47e1de 100755 (executable)
--- 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 8fd11dd15508e2fd676b1e2a7eee949af72d7fec..7e659f3eff9f5dbc47b02557588d370615fb175a 100644 (file)
--- 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;
                        }