From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 1 Nov 2012 19:29:13 +0000 (+0100)
Subject: Fixed dropdown positions
X-Git-Tag: 2.0.0_Beta_1~821^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7382b20f78b528932895bc1596aa2ac81a3a8702;p=GitHub%2FWoltLab%2FWCF.git

Fixed dropdown positions
---

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 7cb00fdef9..6595819ec4 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -64,7 +64,7 @@ String.prototype.hashCode = function() {
 	}
 	
 	return $hash;
-}
+};
 
 /**
  * Initialize WCF namespace
@@ -607,6 +607,7 @@ WCF.Dropdown = {
 	 * Initializes dropdowns.
 	 */
 	init: function() {
+		var $userPanelHeight = $('#topMenu').outerHeight();
 		var self = this;
 		$('.dropdownToggle').each(function(index, dropdown) {
 			var $dropdown = $(dropdown);
@@ -623,9 +624,16 @@ WCF.Dropdown = {
 				$dropdown.click($.proxy(self._toggle, self));
 				self._dropdowns[$containerID] = $toggle;
 				
+				var $dropdownHeight = $dropdown.outerHeight();
+				var $top = $dropdownHeight + 7;
+				if ($dropdown.parents('#topMenu').length) {
+					// fix calculation for user panel (elements may be shorter than they appear)
+					$top = $userPanelHeight;
+				}
+				
 				// calculate top offset for menu
 				$dropdown.next('.dropdownMenu').css({
-					top: $dropdown.outerHeight() + 14
+					top: $top + 'px'
 				});
 			}
 		});
@@ -2315,8 +2323,7 @@ WCF.Language = {
  * @param	object		values
  * @param	object		availableLanguages
  */
-WCF.MultipleLanguageInput = function(elementID, forceSelection, values, availableLanguages) { this.init(elementID, forceSelection, values, availableLanguages); };
-WCF.MultipleLanguageInput.prototype = {
+WCF.MultipleLanguageInput = Class.extend({
 	/**
 	 * list of available languages
 	 * @var	object
@@ -2418,26 +2425,17 @@ WCF.MultipleLanguageInput.prototype = {
 		var $button = $('<p class="button dropdownToggle"><span>' + WCF.Language.get('wcf.global.button.disabledI18n') + '</span></p>').prependTo($wrapper);
 		$button.data('toggle', $wrapper.wcfIdentify()).click($.proxy(this._enable, this));
 		
+		// insert list
+		this._list = $('<ul class="dropdownMenu"></ul>').insertAfter($button);
+		
 		// add a special class if next item is a textarea
-		var $top = null;
-		if ($button.next().getTagName() === 'textarea') {
-			$top = $button.outerHeight() - 1;
+		if ($button.nextAll('textarea').length) {
 			$button.addClass('dropdownCaptionTextarea');
 		}
 		else {
 			$button.addClass('dropdownCaption');
 		}
 		
-		// insert list
-		this._list = $('<ul class="dropdownMenu"></ul>').insertAfter($button);
-		
-		// set top offset for menu
-		if ($top !== null) {
-			this._list.css({
-				top: $top
-			});
-		}
-		
 		// insert available languages
 		for (var $languageID in this._availableLanguages) {
 			$('<li><span>' + this._availableLanguages[$languageID] + '</span></li>').data('languageID', $languageID).click($.proxy(this._changeLanguage, this)).appendTo(this._list);
@@ -2487,6 +2485,12 @@ WCF.MultipleLanguageInput.prototype = {
 	_enable: function(event) {
 		if (!this._isEnabled) {
 			var $button = $(event.currentTarget);
+			if ($button.hasClass('dropdownCaptionTextarea')) {
+				$button.next('.dropdownMenu').css({
+					top: ($button.outerHeight() - 1) + 'px'
+				});
+			}
+			
 			if ($button.getTagName() === 'p') {
 				$button = $button.children('span:eq(0)');
 			}
@@ -2627,7 +2631,7 @@ WCF.MultipleLanguageInput.prototype = {
 		// remove name attribute to prevent conflict with i18n values
 		this._element.removeAttr('name');
 	}
-};
+});
 
 /**
  * Icon collection used across all JavaScript classes.