Commit 4bcf7e1

authored

Merge pull request #120 from moormaster/master

fix: display error message (again) when regular expression contains errors

2 parents d947ee4 + b49933a commit 4bcf7e1Copy full SHA for 4bcf7e1

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`<title>{{ page.title \| escape }} - {{ site.data.localization.title[page.lang] }}</title>`
`23`	`23`	`<script type="text/javascript">`
`24`	`24`	`var current_page_id = "page-" + {{ page.path \| jsonify }};`
	`25`	`+`
	`26`	`+ var errorMessage = "{{ site.data.localization.error.message[page.lang] }}";`
	`27`	`+ var errorReferenceWrong = "{{ site.data.localization.error.reference[page.lang] }}";`
`25`	`28`	`</script>`
`26`	`29`	`<style>`
`27`	`30`	`.clicked .toggle-hint:before {`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,11 @@`
`2`	`2`	`var playfieldsLoaded = false;`
`3`	`3`
`4`	`4`	`function translateErrorMessage(message) {`
`5`		`- var translation = (errorMessages[message] \|\| PLEASE_TRANSLATE);`
`6`		`- return ERROR_MESSAGE + ": \"" + message + "\": " + translation;`
	`5`	`+ return errorMessage + ": \"" + message + "\"";`
	`6`	`+}`
	`7`	`+`
	`8`	`+function translateReferenceWrongErrorMessage(message) {`
	`9`	`+ return errorReferenceWrong + ": \"" + message + "\"";`
`7`	`10`	`}`
`8`	`11`
`9`	`12`	`function matchTextElement(string) {`
`@@ -59,7 +62,7 @@ function watchExpression(playfield, examples, regex, message) {`
`59`	`62`	`try {`
`60`	`63`	`return RegExp(reference);`
`61`	`64`	`} catch (err) {`
`62`		`- message.innerHTML = translateErrorMessage(err.message)+errorReferenceWrong;`
	`65`	`+ message.innerHTML = translateReferenceWrongErrorMessage(err.message);`
`63`	`66`	`return null;`
`64`	`67`	`}`
`65`	`68`	`}`

Comments

(0)