Fixed language dropdown

Closes #843

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index e31a8484d774a09d08e27066297ba38617ea5952..1c254c3804c3f7607341b56065eca960bb698e9a 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -6467,17 +6467,19 @@ WCF.Language.Chooser = Class.extend({
                
                // create language dropdown
                this._dropdown = $('<div class="dropdown" id="' + containerID + '-languageChooser" />').appendTo($container);
-               $('<div class="dropdownToggle boxFlag" data-toggle="' + containerID + '-languageChooser"></div>').appendTo(this._dropdown);
+               $('<div class="dropdownToggle boxFlag box24" data-toggle="' + containerID + '-languageChooser"></div>').appendTo(this._dropdown);
                var $dropdownMenu = $('<ul class="dropdownMenu" />').appendTo(this._dropdown);
                
                for (var $languageID in languages) {
                        var $language = languages[$languageID];
-                       var $item = $('<li class="boxFlag"><div class="framed"><img src="' + $language.iconPath + '" alt="" class="iconFlag" /></div> <hgroup><h1>' + $language.languageName + '</h1></hgroup>').appendTo($dropdownMenu);
+                       var $item = $('<li class="boxFlag"><a class="box24"><div class="framed"><img src="' + $language.iconPath + '" alt="" class="iconFlag" /></div> <hgroup><h1>' + $language.languageName + '</h1></hgroup></a></li>').appendTo($dropdownMenu);
                        $item.data('languageID', $languageID).click($.proxy(this._click, this));
                        
                        // update dropdown label
                        if ($languageID == languageID) {
-                               this._dropdown.children('.dropdownToggle').html($item.html());
+                               var $html = $('' + $item.html());
+                               var $innerContent = $html.children().detach();
+                               this._dropdown.children('.dropdownToggle').empty().append($innerContent);
                        }
                }
                
@@ -6496,7 +6498,9 @@ WCF.Language.Chooser = Class.extend({
                this._input.val($item.data('languageID'));
                
                // update dropdown label
-               this._dropdown.children('.dropdownToggle').html($item.html());
+               var $html = $('' + $item.html());
+               var $innerContent = $html.children().detach();
+               this._dropdown.children('.dropdownToggle').empty().append($innerContent);
                
                // execute callback
                if (this._callback !== null) {

diff --git a/wcfsetup/install/files/style/dropdown.less b/wcfsetup/install/files/style/dropdown.less
index 1ec57440da893f459ab596ea888c4a56c1079ed9..10cbd08cc7fa770da37de179e531355ed2a2d6dc 100644 (file)
--- a/wcfsetup/install/files/style/dropdown.less
+++ b/wcfsetup/install/files/style/dropdown.less
@@ -189,4 +189,8 @@
        .dropdownToggle {
                cursor: pointer;
        }
+}
+
+.boxFlag > .box24, .boxFlag.box24 {
+       min-height: 20px;
 }
\ No newline at end of file