From: Joshua Rüsweg <josh@bastelstu.be>
Date: Thu, 31 Jan 2019 15:53:03 +0000 (+0100)
Subject: Fix pressing enter triggers trophy badge handler
X-Git-Tag: 3.1.8~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=14bd5084ba9e0911fb61d817128e5eb0930ed82b;p=GitHub%2FWoltLab%2FWCF.git

Fix pressing enter triggers trophy badge handler
Fixes #2818
---

diff --git a/wcfsetup/install/files/acp/templates/trophyAdd.tpl b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
index 69fa975248..64c785a7ef 100644
--- a/wcfsetup/install/files/acp/templates/trophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
@@ -188,7 +188,7 @@
 				<dt>{lang}wcf.acp.trophy.type.badge{/lang}</dt>
 				<dd>
 					<span class="icon icon64 fa-{$iconName} jsTrophyIcon trophyIcon" style="color: {$iconColor}; background-color: {$badgeColor}"></span>
-					<button class="small">{lang}wcf.global.button.edit{/lang}</button>
+					<span class="button small">{lang}wcf.global.button.edit{/lang}</span>
 					
 					<input type="hidden" name="iconName" value="{$iconName}">
 					<input type="hidden" name="iconColor" value="{$iconColor}">
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Badge.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Badge.js
index d0fbb6228d..e49bac88de 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Badge.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Badge.js
@@ -20,7 +20,7 @@ define(['Core', 'Dictionary', 'Language', 'Ui/Dialog', 'WoltLabSuite/Core/Ui/Col
 		 */
 		init: function () {
 			var iconContainer = elById('badgeContainer');
-			elBySel('button', iconContainer).addEventListener(WCF_CLICK_EVENT, this._click.bind(this));
+			elBySel('.button', iconContainer).addEventListener(WCF_CLICK_EVENT, this._click.bind(this));
 			
 			_iconNameInput = elBySel('input[name="iconName"]', iconContainer);
 			_iconColorInput = elBySel('input[name="iconColor"]', iconContainer);