Fix auto-check

Bugfix for #11 (issue #25)
lezsakdomi · Sep 22, 2018 · f8a9be3 · f8a9be3
1 parent dbd4c21
commit f8a9be3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/assets/views/quiz-form/script.js b/assets/views/quiz-form/script.js
@@ -167,12 +167,12 @@ function registerHandlers(document) {
 
 	customClick('form[action="update"] input[type=submit]', () => updateData(), false)
 
-	handleEvent('*', 'change', () => {
+	handleEvent('input', 'change', () => {
 		if (!window.reorderInProgress) {
-			fs(checkForm())
+			autoCheck()
 		}
 	})
-	fs(() => checkForm())
+	autoCheck()
 
 	customClick('form[action="new"] input[type=submit]', () => newQuiz(undefined, true))
 
@@ -270,6 +270,7 @@ document.addEventListener('DOMContentLoaded', () => {
 						.map((input) => parseInt(input.value || 0))
 						.reduce((a, v) => Math.max(a, v), 0)
 					+ 1
+				autoCheck()
 			} else if (tr.previousElementSibling === null || tr.previousElementSibling
 				.querySelector('input[name$="[order]"]').value === '') {
 				if (tr.nextElementSibling && tr.nextElementSibling
@@ -282,6 +283,8 @@ document.addEventListener('DOMContentLoaded', () => {
 						.forEach((orderInput) => orderInput.value -= shift)
 
 					orderInput.value = 1
+
+					autoCheck()
 				}
 			} else if (insertBefore) {
 				orderInput.value = insertBefore.querySelector('input[name$="[order]"]').value
@@ -418,7 +421,7 @@ function reorderStart(trs = document.querySelectorAll('tr')) {
 
 function reorderEnd(trs = document.querySelectorAll('tr')) {
 	window.reorderInPorgress = false
-	fs(checkForm())
+	autoCheck()
 	if (trs instanceof HTMLElement) {
 		trs = arguments
 	}
@@ -497,6 +500,12 @@ function newQuiz(data = gatherData(), handleResult = false) {
 	return promise
 }
 
+function autoCheck() {
+	if (document.querySelector('form').getAttribute('action') === 'check') {
+		fs(() => checkForm())
+	}
+}
+
 function checkForm(force = false) {
 	const form = document.querySelector('form')
 	// noinspection JSCheckFunctionSignatures

diff --git a/modules/quizzes-router.js b/modules/quizzes-router.js
@@ -63,7 +63,7 @@ router.post('/new', async (req, res, next) => {
 const quizRouter = express.Router({})
 
 // noinspection JSUnresolvedFunction
-router.use('/:qid', async (req, res, next) => {
+router.use('/:qid([0-fA-F]{24}|[\0-\255]{12})', async (req, res, next) => {
 	// noinspection JSUnresolvedVariable
 	debug('Fetching quiz \'%s\'...', req.params.qid)
 	try {