From 6404c8beef04dbd4f7bfebc06c115d7d4b852086 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 14 Sep 2022 17:19:54 +0200
Subject: [PATCH] Add explicit `type` to `<button>`

---
 .../js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js  | 2 +-
 templates/conversation.tpl                                  | 5 +++--
 templates/conversationAdd.tpl                               | 2 +-
 templates/conversationAddParticipants.tpl                   | 2 +-
 templates/conversationLabelAssignment.tpl                   | 2 +-
 templates/conversationLabelManagement.tpl                   | 6 +++---
 templates/conversationLeave.tpl                             | 2 +-
 templates/conversationList.tpl                              | 4 ++--
 templates/conversationMessageInlineEditor.tpl               | 4 ++--
 templates/conversationMessageList.tpl                       | 2 +-
 ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts      | 4 +++-
 11 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js b/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
index bd0e5f7..98e5982 100644
--- a/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
+++ b/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
@@ -83,7 +83,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Ui/Dialog", "WoltLabSu
           </dd>
         </dl>
         <div class="formSubmit">
-          <button class="buttonPrimary jsButtonSave">${Language.get("wcf.global.button.save")}</button>
+          <button type="button" class="button buttonPrimary jsButtonSave">${Language.get("wcf.global.button.save")}</button>
         </div>
       `,
             };
diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index d476cd7..c9adba3 100644
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -50,7 +50,7 @@
 					{content}
 						{if $conversation->canReply()}
 							<li class="jsOnly">
-								<button class="button buttonPrimary jsQuickReply">
+								<button type="button" class="button buttonPrimary jsQuickReply">
 									{icon name='reply'}
 									<span>{lang}wcf.conversation.message.button.add{/lang}</span>
 								</button>
@@ -76,7 +76,7 @@
 				<span>{lang}wcf.global.button.edit{/lang}</span>
 			</a>
 		{else}
-			<button class="button small jsConversationInlineEditor">
+			<button type="button" class="button small jsConversationInlineEditor">
 				{icon name='pencil'}
 				<span>{lang}wcf.global.button.edit{/lang}</span>
 			</button>
@@ -101,6 +101,7 @@
 								{if $participant->isInvisible}<small>({lang}wcf.conversation.invisible{/lang})</small>{/if}
 								{if $participant->userID && ($conversation->userID == $__wcf->getUser()->userID) && ($participant->userID != $__wcf->getUser()->userID) && $participant->hideConversation != 2 && $participant->leftAt == 0}
 									<button
+										type="button"
 										class="jsObjectAction jsTooltip jsOnly"
 										data-object-action="removeParticipant"
 										title="{lang}wcf.conversation.participants.removeParticipant{/lang}"
diff --git a/templates/conversationAdd.tpl b/templates/conversationAdd.tpl
index 052d571..175eb43 100644
--- a/templates/conversationAdd.tpl
+++ b/templates/conversationAdd.tpl
@@ -124,7 +124,7 @@
 	
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		<button name="draft" accesskey="d" value="1">{lang}wcf.conversation.button.saveAsDraft{/lang}</button>
+		<button type="submit" class="button" name="draft" accesskey="d" value="1">{lang}wcf.conversation.button.saveAsDraft{/lang}</button>
 		{include file='messageFormPreviewButton' previewMessageObjectType='com.woltlab.wcf.conversation.message' previewMessageObjectID=0}
 		{csrfToken}
 	</div>
diff --git a/templates/conversationAddParticipants.tpl b/templates/conversationAddParticipants.tpl
index cca3719..fecdd1a 100644
--- a/templates/conversationAddParticipants.tpl
+++ b/templates/conversationAddParticipants.tpl
@@ -22,5 +22,5 @@
 {/if}
 
 <div class="formSubmit">
-	<button id="addParticipants" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button type="button" id="addParticipants" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
\ No newline at end of file
diff --git a/templates/conversationLabelAssignment.tpl b/templates/conversationLabelAssignment.tpl
index 92c637d..180675e 100644
--- a/templates/conversationLabelAssignment.tpl
+++ b/templates/conversationLabelAssignment.tpl
@@ -10,5 +10,5 @@
 </ul>
 
 <div class="formSubmit">
-	<button class="buttonPrimary" id="assignLabels">{lang}wcf.global.button.save{/lang}</button>
+	<button type="button" class="button buttonPrimary" id="assignLabels">{lang}wcf.global.button.save{/lang}</button>
 </div>
diff --git a/templates/conversationLabelManagement.tpl b/templates/conversationLabelManagement.tpl
index b915eef..c7a837e 100644
--- a/templates/conversationLabelManagement.tpl
+++ b/templates/conversationLabelManagement.tpl
@@ -36,8 +36,8 @@
 	</dl>
 	
 	<div class="formSubmit">
-		<button id="addLabel" class="buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
-		<button id="editLabel" style="display: none;" class="buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
-		<button id="deleteLabel" style="display: none;">{lang}wcf.conversation.label.management.deleteLabel{/lang}</button>
+		<button type="button" id="addLabel" class="button buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
+		<button type="button" id="editLabel" class="button" style="display: none;" class="buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
+		<button type="button" id="deleteLabel" class="button" style="display: none;">{lang}wcf.conversation.label.management.deleteLabel{/lang}</button>
 	</div>
 </section>
\ No newline at end of file
diff --git a/templates/conversationLeave.tpl b/templates/conversationLeave.tpl
index 7350529..177fb93 100644
--- a/templates/conversationLeave.tpl
+++ b/templates/conversationLeave.tpl
@@ -16,5 +16,5 @@
 </dl>
 
 <div class="formSubmit">
-	<button id="hideConversation" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button type="button" id="hideConversation" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index 5063179..a3a116e 100644
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -104,7 +104,7 @@
 		</div>
 		
 		<div class="boxContent">
-			<button id="manageLabel">{lang}wcf.conversation.label.management{/lang}</button>
+			<button type="button" id="manageLabel" class="button">{lang}wcf.conversation.label.management{/lang}</button>
 		</div>
 	</section>
 	
@@ -135,7 +135,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-	<button class="markAllAsReadButton contentInteractionButton button small jsOnly">
+	<button type="button" class="markAllAsReadButton contentInteractionButton button small jsOnly">
 		{icon name='check'}
 		<span>{lang}wcf.global.button.markAllAsRead{/lang}</span>
 	</button>
diff --git a/templates/conversationMessageInlineEditor.tpl b/templates/conversationMessageInlineEditor.tpl
index 6eee8d5..cffb0e9 100644
--- a/templates/conversationMessageInlineEditor.tpl
+++ b/templates/conversationMessageInlineEditor.tpl
@@ -8,11 +8,11 @@
 	{include file='messageFormTabsInline' inConversationInlineEdit=true wysiwygContainerID=$wysiwygContainerID}
 	
 	<div class="formSubmit">
-		<button class="buttonPrimary" data-type="save">{lang}wcf.global.button.save{/lang}</button>
+		<button type="button" class="button buttonPrimary" data-type="save">{lang}wcf.global.button.save{/lang}</button>
 		
 		{include file='messageFormPreviewButton' previewMessageFieldID=$wysiwygSelector previewButtonID=$wysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.conversation.message' previewMessageObjectID=$message->messageID}
 		
-		<button data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
+		<button type="button" class="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
 	</div>
 	
 	{include file='wysiwyg' wysiwygEnableUpload=true}
diff --git a/templates/conversationMessageList.tpl b/templates/conversationMessageList.tpl
index 5c6ce33..6f51a9f 100644
--- a/templates/conversationMessageList.tpl
+++ b/templates/conversationMessageList.tpl
@@ -97,7 +97,7 @@
 							</li>
 							{if $message->userID != $__wcf->getUser()->userID && $__wcf->session->getPermission('user.profile.canReportContent')}
 								<li class="jsReportConversationMessage jsOnly" data-object-id="{@$message->messageID}">
-									<button title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">
+									<button type="button" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">
 										{icon name='triangle-exclamation'}
 										<span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span>
 									</button>
diff --git a/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts b/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts
index 08cf853..c1c69fe 100644
--- a/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts
+++ b/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts
@@ -114,7 +114,9 @@ class UiSubjectEditor implements AjaxCallbackObject, DialogCallbackObject {
           </dd>
         </dl>
         <div class="formSubmit">
-          <button class="buttonPrimary jsButtonSave">${Language.get("wcf.global.button.save")}</button>
+          <button type="button" class="button buttonPrimary jsButtonSave">${Language.get(
+            "wcf.global.button.save",
+          )}</button>
         </div>
       `,
     };
-- 
2.20.1