From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 12 Oct 2013 13:24:19 +0000 (+0200)
Subject: Adds scrollableDropdownMenu support for label choosers
X-Git-Tag: 2.0.0_Beta_11~39^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a6867d9007c17261c25b6d1cc601b22508be207f;p=GitHub%2FWoltLab%2FWCF.git

Adds scrollableDropdownMenu support for label choosers
---

diff --git a/wcfsetup/install/files/js/WCF.Label.js b/wcfsetup/install/files/js/WCF.Label.js
index d02625f96e..a9ef8b8ac1 100644
--- a/wcfsetup/install/files/js/WCF.Label.js
+++ b/wcfsetup/install/files/js/WCF.Label.js
@@ -184,20 +184,26 @@ WCF.Label.Chooser = Class.extend({
 					$dropdownMenu = WCF.Dropdown.getDropdownMenu($containerID);
 				}
 				
+				var $additionalList = $dropdownMenu;
+				if ($dropdownMenu.getTagName() == 'div' && $dropdownMenu.children('.scrollableDropdownMenu').length) {
+					$additionalList = $('<ul />').appendTo($dropdownMenu);
+					$dropdownMenu = $dropdownMenu.children('.scrollableDropdownMenu');
+				}
+				
 				this._groups[$groupID] = $group;
 				
 				$dropdownMenu.children('li').data('groupID', $groupID).click($.proxy(this._click, this));
 				
 				if (!$group.data('forceSelection') || this._showWithoutSelection) {
-					$('<li class="dropdownDivider" />').appendTo($dropdownMenu);
+					$('<li class="dropdownDivider" />').appendTo($additionalList);
 				}
 				
 				if (this._showWithoutSelection) {
-					$('<li data-label-id="-1"><span><span class="badge label">' + WCF.Language.get('wcf.label.withoutSelection') + '</span></span></li>').data('groupID', $groupID).appendTo($dropdownMenu).click($.proxy(this._click, this));
+					$('<li data-label-id="-1"><span><span class="badge label">' + WCF.Language.get('wcf.label.withoutSelection') + '</span></span></li>').data('groupID', $groupID).appendTo($additionalList).click($.proxy(this._click, this));
 				}
 				
 				if (!$group.data('forceSelection')) {
-					var $buttonEmpty = $('<li data-label-id="0"><span><span class="badge label">' + WCF.Language.get('wcf.label.none') + '</span></span></li>').data('groupID', $groupID).appendTo($dropdownMenu);
+					var $buttonEmpty = $('<li data-label-id="0"><span><span class="badge label">' + WCF.Language.get('wcf.label.none') + '</span></span></li>').data('groupID', $groupID).appendTo($additionalList);
 					$buttonEmpty.click($.proxy(this._click, this));
 				}
 			}
@@ -263,4 +269,4 @@ WCF.Label.Chooser = Class.extend({
 			}
 		}
 	}
-});
\ No newline at end of file
+});