Rename #vstobjects to #main-form (hestiacp#3718)

Author: AlecRust

web/js/src/alpineInit.js

@@ -27,7 +27,7 @@ export default function alpineInit() {
 		},
 	});
 	document
-		.querySelectorAll('#vstobjects input, #vstobjects select, #vstobjects textarea')
+		.querySelectorAll('#main-form input, #main-form select, #main-form textarea')
 		.forEach((el) => {
 			el.addEventListener('change', () => {
 				Alpine.store('form').makeDirty();

web/js/src/cronGenerator.js

@@ -7,7 +7,7 @@ export default function handleCronGenerator() {
 
 			inputNames.forEach((inputName) => {
 				const value = fieldset.querySelector(`[name=h_${inputName}]`).value;
-				const formInput = document.querySelector(`#vstobjects input[name=v_${inputName}]`);
+				const formInput = document.querySelector(`#main-form input[name=v_${inputName}]`);
 
 				formInput.value = value;
 				formInput.classList.add('highlighted');

web/js/src/focusFirstInput.js

@@ -4,8 +4,7 @@ export default function focusFirstInput() {
 	const openDialogs = document.querySelectorAll('dialog[open]');
 	if (openDialogs.length === 0) {
 		const input = document.querySelector(
-			'#vstobjects .form-control:not([disabled]),\
-		#vstobjects .form-select:not([disabled])'
+			'#main-form .form-control:not([disabled]), #main-form .form-select:not([disabled])'
 		);
 		if (input) {
 			input.focus();

web/js/src/formSubmit.js

@@ -3,14 +3,14 @@ import { updateAdvancedTextarea } from './toggleAdvanced';
 import { showSpinner } from './helpers';
 
 export default function handleFormSubmit() {
-	const pageForm = document.querySelector('#vstobjects');
-	if (pageForm) {
-		pageForm.addEventListener('submit', () => {
+	const mainForm = document.querySelector('#main-form');
+	if (mainForm) {
+		mainForm.addEventListener('submit', () => {
 			// Show loading spinner
 			showSpinner();
 
 			// Enable any disabled inputs to ensure all fields are submitted
-			if (pageForm.classList.contains('js-enable-inputs-on-submit')) {
+			if (mainForm.classList.contains('js-enable-inputs-on-submit')) {
 				document.querySelectorAll('input[disabled]').forEach((input) => {
 					input.disabled = false;
 				});

web/js/src/shortcuts.js

@@ -137,7 +137,7 @@ export default function handleShortcuts() {
 			{ disabledInInput: true }
 		)
 		.register({ code: 'Enter', ctrlKey: true }, (_evt) => {
-			document.querySelector('form#vstobjects').submit();
+			document.querySelector('#main-form').submit();
 		})
 		.register({ code: 'Backspace', ctrlKey: true }, (_evt) => {
 			const redirect = document.querySelector('a.js-button-back').href;
@@ -429,8 +429,8 @@ export default function handleShortcuts() {
 		.register(
 			{ code: 'Enter' },
 			(evt) => {
-				if (evt.target.tagName == 'INPUT' && evt.target.form.id == 'vstobjects') {
-					document.querySelector('form#vstobjects').submit();
+				if (evt.target.tagName === 'INPUT' && evt.target.form.id === 'main-form') {
+					evt.target.form.submit();
 				}
 
 				if (Alpine.store('form').dirty) {

web/js/src/toggleAdvanced.js

@@ -24,7 +24,7 @@ function toggleAdvancedOptions() {
 // Update the "advanced options" textarea with "basic options" input values
 export function updateAdvancedTextarea() {
 	const advancedTextarea = document.querySelector('.js-advanced-textarea');
-	const textInputs = document.querySelectorAll('#vstobjects input[type=text]');
+	const textInputs = document.querySelectorAll('#main-form input[type=text]');
 
 	textInputs.forEach((textInput) => {
 		const search = textInput.dataset.regexp;

web/templates/pages/add_access_key.php

@@ -7,7 +7,7 @@
 			</a>
 		</div>
 		<div class="toolbar-buttons">
-			<button type="submit" class="button" form="vstobjects">
+			<button type="submit" class="button" form="main-form">
 				<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
 			</button>
 		</div>
@@ -16,7 +16,7 @@
 <!-- End toolbar -->
 
 <div class="container animate__animated animate__fadeIn">
-	<form id="vstobjects" name="v_add_access_key" method="post">
+	<form id="main-form" name="v_add_access_key" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 

web/templates/pages/add_cron.php

@@ -7,7 +7,7 @@
 			</a>
 		</div>
 		<div class="toolbar-buttons">
-			<button type="submit" class="button" form="vstobjects">
+			<button type="submit" class="button" form="main-form">
 				<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
 			</button>
 		</div>
@@ -17,7 +17,7 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<form id="vstobjects" name="v_add_cron" method="post">
+	<form id="main-form" name="v_add_cron" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 

web/templates/pages/add_db.php

@@ -7,7 +7,7 @@
 			</a>
 		</div>
 		<div class="toolbar-buttons">
-			<button type="submit" class="button" form="vstobjects">
+			<button type="submit" class="button" form="main-form">
 				<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
 			</button>
 		</div>
@@ -21,7 +21,7 @@
 		x-data="{
 			showAdvanced: <?= empty($v_adv) ? "false" : "true" ?>
 		}"
-		id="vstobjects"
+		id="main-form"
 		name="v_add_db"
 		method="post"
 	>

web/templates/pages/add_dns.php

@@ -7,7 +7,7 @@
 			</a>
 		</div>
 		<div class="toolbar-buttons">
-			<button type="submit" class="button" form="vstobjects">
+			<button type="submit" class="button" form="main-form">
 				<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
 			</button>
 		</div>
@@ -21,7 +21,7 @@
 		x-data="{
 			showAdvanced: <?= empty($v_adv) ? "false" : "true" ?>
 		}"
-		id="vstobjects"
+		id="main-form"
 		name="v_add_dns"
 		method="post"
 	>