From d1c49a7663179299ec586c6cdd4b468ab34314e5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 24 Nov 2022 20:07:39 -0500
Subject: [PATCH] Revert "fix: replace input type number with text/pattern"

This reverts commit cde4c6ac7e413b8a0d3ed9262814e3d43f999ded.

The changeset was naive in the sense that a lot of the changes inputs actually work better as type="number".
---
 public/language/en-GB/admin/settings/email.json   | 1 -
 src/views/admin/partials/api/sorted-list/form.tpl | 2 +-
 src/views/admin/partials/temporary-ban.tpl        | 2 +-
 src/views/admin/partials/temporary-mute.tpl       | 2 +-
 src/views/admin/settings/advanced.tpl             | 6 +++---
 src/views/admin/settings/cookies.tpl              | 2 +-
 src/views/admin/settings/email.tpl                | 6 +++---
 src/views/admin/settings/post.tpl                 | 6 +++---
 src/views/admin/settings/uploads.tpl              | 2 +-
 src/views/admin/settings/user.tpl                 | 6 +++---
 10 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/public/language/en-GB/admin/settings/email.json b/public/language/en-GB/admin/settings/email.json
index 6f05a400c2..35e713adc0 100644
--- a/public/language/en-GB/admin/settings/email.json
+++ b/public/language/en-GB/admin/settings/email.json
@@ -40,7 +40,6 @@
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
-	"subscriptions.hour-hint": "a number between 0 and 24",
 	"notifications.remove-images": "Remove images from email notifications",
 	"require-email-address": "Require new users to specify an email address",
 	"require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. <strong>It does not ensure user will enter a real email address, nor even an address they own.</strong>",
diff --git a/src/views/admin/partials/api/sorted-list/form.tpl b/src/views/admin/partials/api/sorted-list/form.tpl
index b69447aecb..00acbe7c05 100644
--- a/src/views/admin/partials/api/sorted-list/form.tpl
+++ b/src/views/admin/partials/api/sorted-list/form.tpl
@@ -3,7 +3,7 @@
     <input type="hidden" name="timestamp" />
     <div class="form-group">
         <label for="uid">[[admin/settings/api:uid]]</label>
-        <input type="text" inputmode="numeric" pattern="\d+" name="uid" class="form-control" placeholder="1" />
+        <input type="number" name="uid" class="form-control" placeholder="1" min="0" />
         <p class="help-text">
             [[admin/settings/api:uid-help-text]]
         </p>
diff --git a/src/views/admin/partials/temporary-ban.tpl b/src/views/admin/partials/temporary-ban.tpl
index c99df22f23..5a3fdc9c62 100644
--- a/src/views/admin/partials/temporary-ban.tpl
+++ b/src/views/admin/partials/temporary-ban.tpl
@@ -3,7 +3,7 @@
 		<div class="col-xs-4">
 			<div class="form-group">
 				<label for="length">[[admin/manage/users:temp-ban.length]]</label>
-				<input class="form-control" id="length" name="length" type="text" pattern="\d+" value="1" />
+				<input class="form-control" id="length" name="length" type="number" min="0" value="1" />
 			</div>
 		</div>
 		<div class="col-xs-8">
diff --git a/src/views/admin/partials/temporary-mute.tpl b/src/views/admin/partials/temporary-mute.tpl
index 03256c76b5..31bcd631f3 100644
--- a/src/views/admin/partials/temporary-mute.tpl
+++ b/src/views/admin/partials/temporary-mute.tpl
@@ -3,7 +3,7 @@
 		<div class="col-xs-4">
 			<div class="form-group">
 				<label for="length">[[admin/manage/users:temp-ban.length]]</label>
-				<input class="form-control" id="length" name="length" type="text" inputmode="numeric" pattern="\d+" value="1" />
+				<input class="form-control" id="length" name="length" type="number" min="0" value="1" />
 			</div>
 		</div>
 		<div class="col-xs-8">
diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index 6359d48615..860e730790 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -121,7 +121,7 @@
 			</div>
 			<div class="form-group">
 				<label for="hsts-maxage">[[admin/settings/advanced:hsts.maxAge]]</label>
-				<input class="form-control" id="hsts-maxage" type="text" inputmode="numeric" pattern="\d+" placeholder="31536000" data-field="hsts-maxage" /><br />
+				<input class="form-control" id="hsts-maxage" type="text" pattern="\d+" placeholder="31536000" data-field="hsts-maxage" /><br />
 			</div>
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
@@ -157,14 +157,14 @@
 			</div>
 			<div class="form-group">
 				<label for="eventLoopLagThreshold">[[admin/settings/advanced:traffic.event-lag]]</label>
-				<input class="form-control" id="eventLoopLagThreshold" type="text" inputmode="numeric" pattern="\d+" data-field="eventLoopLagThreshold" placeholder="Default: 70" step="10" min="10" value="70" />
+				<input class="form-control" id="eventLoopLagThreshold" type="number" data-field="eventLoopLagThreshold" placeholder="Default: 70" step="10" min="10" value="70" />
 				<p class="help-block">
 					[[admin/settings/advanced:traffic.event-lag-help]]
 				</p>
 			</div>
 			<div class="form-group">
 				<label for="eventLoopInterval">[[admin/settings/advanced:traffic.lag-check-interval]]</label>
-				<input class="form-control" id="eventLoopInterval" type="text" inputmode="numeric" pattern="\d+" data-field="eventLoopInterval" placeholder="Default: 500" value="500" step="50" />
+				<input class="form-control" id="eventLoopInterval" type="number" data-field="eventLoopInterval" placeholder="Default: 500" value="500" step="50" />
 				<p class="help-block">
 					[[admin/settings/advanced:traffic.lag-check-interval-help]]
 				</p>
diff --git a/src/views/admin/settings/cookies.tpl b/src/views/admin/settings/cookies.tpl
index cdf4807b66..367c86d257 100644
--- a/src/views/admin/settings/cookies.tpl
+++ b/src/views/admin/settings/cookies.tpl
@@ -55,7 +55,7 @@
 
 			<div class="form-group">
 				<label for="maxUserSessions">[[admin/settings/cookies:max-user-sessions]]</label>
-				<input class="form-control" id="maxUserSessions" type="text" inputmode="numeric" pattern="\d+" placeholder="10" data-field="maxUserSessions" /><br />
+				<input class="form-control" id="maxUserSessions" type="number" placeholder="10" data-field="maxUserSessions" /><br />
 				<p class="help-block">
 					[[admin/settings/cookies:blank-default]]
 				</p>
diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
index e528b51e58..4d8dcf27b1 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -50,13 +50,13 @@
 	<div class="col-sm-10 col-xs-12">
 		<div class="form-group form-inline">
 			<label for="emailConfirmInterval">[[admin/settings/user:email-confirm-interval]]</label>
-			<input class="form-control" data-field="emailConfirmInterval" type="text" inputmode="numeric" pattern="\d+" id="emailConfirmInterval" placeholder="10" />
+			<input class="form-control" data-field="emailConfirmInterval" type="number" id="emailConfirmInterval" placeholder="10" />
 			<label for="emailConfirmInterval">[[admin/settings/user:email-confirm-interval2]]</label>
 		</div>
 
 		<div class="form-group">
 			<label for="emailConfirmExpiry">[[admin/settings/email:confirmation.expiry]]</label>
-			<input class="form-control" data-field="emailConfirmExpiry" type="text" inputmode="numeric" pattern="\d+" id="emailConfirmExpiry" placeholder="24" />
+			<input class="form-control" data-field="emailConfirmExpiry" type="number" id="emailConfirmExpiry" placeholder="24" />
 		</div>
 
 		<div class="checkbox">
@@ -97,7 +97,7 @@
 
 			<div class="form-group">
 				<label for="digestHour"><strong>[[admin/settings/email:subscriptions.hour]]</strong></label>
-				<input type="text" inputmode="numeric" pattern="\d{1,2}" class="form-control input-lg" id="digestHour" data-field="digestHour" placeholder="17" title="[[admin/settings/email:subscriptions.hour-hint]]" />
+				<input type="number" class="form-control input-lg" id="digestHour" data-field="digestHour" placeholder="17" min="0" max="24" />
 				<p class="help-block">
 					[[admin/settings/email:subscriptions.hour-help]]
 				</p>
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index fda6efb623..8e8d2e76bc 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -158,21 +158,21 @@
 		<form>
 			<div class="form-group">
 				<label for="timeagoCutoff">[[admin/settings/post:timestamp.cut-off]]</label>
-				<input type="text" inputmode="numeric" pattern="\d+" class="form-control" id="timeagoCutoff" data-field="timeagoCutoff"  />
+				<input type="number" class="form-control" id="timeagoCutoff" data-field="timeagoCutoff"  />
 				<p class="help-block">
 					[[admin/settings/post:timestamp.cut-off-help]]
 				</p>
 			</div>
 			<div class="form-group">
 				<label for="necroThreshold">[[admin/settings/post:timestamp.necro-threshold]]</label>
-				<input type="text" inputmode="numeric" pattern="\d+" class="form-control" id="necroThreshold" data-field="necroThreshold"  />
+				<input type="number" class="form-control" id="necroThreshold" data-field="necroThreshold"  />
 				<p class="help-block">
 					[[admin/settings/post:timestamp.necro-threshold-help]]
 				</p>
 			</div>
 			<div class="form-group">
 				<label for="incrementTopicViewsInterval">[[admin/settings/post:timestamp.topic-views-interval]]</label>
-				<input type="text" inputmode="numeric" pattern="\d+" class="form-control" id="incrementTopicViewsInterval" data-field="incrementTopicViewsInterval"  />
+				<input type="number" class="form-control" id="incrementTopicViewsInterval" data-field="incrementTopicViewsInterval"  />
 				<p class="help-block">
 					[[admin/settings/post:timestamp.topic-views-interval-help]]
 				</p>
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl
index 49d344b2ab..820d6943dc 100644
--- a/src/views/admin/settings/uploads.tpl
+++ b/src/views/admin/settings/uploads.tpl
@@ -137,7 +137,7 @@
 		<div class="row">
 			<div class="form-group col-sm-6">
 				<label for="orphanExpiryDays">[[admin/settings/uploads:orphanExpiryDays]]</label>
-				<input id="orphanExpiryDays" type="text" inputmode="numeric" pattern="\d+" placeholder="0" class="form-control" data-field="orphanExpiryDays" />
+				<input id="orphanExpiryDays" type="number" min="0" placeholder="0" class="form-control" data-field="orphanExpiryDays" />
 				<p class="help-block">[[admin/settings/uploads:orphanExpiryDays-help]]</p>
 			</div>
 		</div>
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index c5eaf88b9e..8a04d13524 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -179,7 +179,7 @@
 			</div>
 			<div class="form-group">
 				<label for="autoApproveTime">[[admin/settings/user:registration-queue-auto-approve-time]]</label>
-				<input id="autoApproveTime" type="text" inputmode="numeric" pattern="\d+" class="form-control" data-field="autoApproveTime" placeholder="0">
+				<input id="autoApproveTime" type="number" class="form-control" data-field="autoApproveTime" placeholder="0">
 				<p class="help-block">
 					[[admin/settings/user:registration-queue-auto-approve-time-help]]
 				</p>
@@ -201,14 +201,14 @@
 
 			<div class="form-group">
 				<label for="maximumInvites">[[admin/settings/user:max-invites]]</label>
-				<input id="maximumInvites" type="text" inputmode="numeric" pattern="\d+" class="form-control" data-field="maximumInvites" placeholder="0">
+				<input id="maximumInvites" type="number" class="form-control" data-field="maximumInvites" placeholder="0">
 				<p class="help-block">
 					[[admin/settings/user:max-invites-help]]
 				</p>
 			</div>
 			<div class="form-group">
 				<label for="inviteExpiration">[[admin/settings/user:invite-expiration]]</label>
-				<input id="inviteExpiration" type="text" inputmode="numeric" pattern="\d+" class="form-control" data-field="inviteExpiration" placeholder="7">
+				<input id="inviteExpiration" type="number" class="form-control" data-field="inviteExpiration" placeholder="7">
 				<p class="help-block">
 					[[admin/settings/user:invite-expiration-help]]
 				</p>