changeset 2373:a38d24612a67

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Wed, 18 May 2016 16:21:02 +0100
parents 5d66adc88f67 (current diff) a6670226df24 (diff)
children 0cbff12b2eec
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Wed May 18 00:20:43 2016 +0100
+++ b/js/core.js	Wed May 18 16:21:02 2016 +0100
@@ -835,7 +835,7 @@
 			// Must extract the question data
 			var textArea = $(popup.popupContent).find('textarea')[0];
 			if (node.specification.mandatory == true && textArea.value.length == 0) {
-                interfaceContext.lightbox.post("Error","This Question is mandatory");
+                interfaceContext.lightbox.post("Error","This question is mandatory");
 				return;
 			} else {
 				// Save the text content
--- a/tests/examples/ABX_example.xml	Wed May 18 00:20:43 2016 +0100
+++ b/tests/examples/ABX_example.xml	Wed May 18 16:21:02 2016 +0100
@@ -14,7 +14,7 @@
 				<option name="researcher">Research in the field of audio</option>
 			</surveyentry>
 			<surveyentry type="statement" id="test-intro">
-				<statement>This is an example of an 'AB'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
+				<statement>This is an example of an 'ABX'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
 			</surveyentry>
 		</survey>
 		<survey location="after">