changeset 2761:4bf2f7627cdb

Merge branch 'master' into vnext

--- a/js/core.js	Sat Apr 15 12:06:19 2017 +0100
+++ b/js/core.js	Wed Apr 19 09:30:47 2017 +0100
@@ -873,7 +873,7 @@
 
     function processNumber(node) {
         var input = this.popupContent.getElementsByTagName('input')[0];
-        if (node.mandatory === true && input.value.length === 0) {
+        if (node.specification.mandatory === true && input.value.length === 0) {
             interfaceContext.lightbox.post("Error", 'This question is mandatory. Please enter a number');
             return false;
         }
@@ -882,12 +882,12 @@
             interfaceContext.lightbox.post("Error", 'Please enter a valid number');
             return false;
         }
-        if (enteredNumber < node.min && node.min !== null) {
-            interfaceContext.lightbox.post("Error", 'Number is below the minimum value of ' + node.min);
+        if (enteredNumber < node.specification.min && node.specification.min !== null) {
+            interfaceContext.lightbox.post("Error", 'Number is below the minimum value of ' + node.specification.min);
             return false;
         }
-        if (enteredNumber > node.max && node.max !== null) {
-            interfaceContext.lightbox.post("Error", 'Number is above the maximum value of ' + node.max);
+        if (enteredNumber > node.specification.max && node.specification.max !== null) {
+            interfaceContext.lightbox.post("Error", 'Number is above the maximum value of ' + node.specification.max);
             return false;
         }
         node.response = input.value;

--- a/test_create/interface-specs.xml	Sat Apr 15 12:06:19 2017 +0100
+++ b/test_create/interface-specs.xml	Wed Apr 19 09:30:47 2017 +0100
@@ -500,7 +500,7 @@
             </test>
             <test name="AB" interface="AB">
                 <descriptions>
-                    <description lang="en">Each page has only two audio fragments. The user must select one of the two fragments to proceed. There can be one hidden reference.</description>
+                    <description lang="en">A page contains a number of audio fragments. The user must select one of the fragments to proceed. There can be a hidden reference.</description>
                 </descriptions>
                 <checks>
                     <entry name="fragmentPlayed" support="none" />
@@ -520,7 +520,7 @@
             </test>
             <test name="ABX" interface="ABX">
                 <descriptions>
-                    <description lang="en">Each page has two audio fragments presented as A and B. The test duplicates one of the fragments and presents it as X. The user must choose which, out of A or B, is closest to X.</description>
+                    <description lang="en">Each page has a number of audio fragments presented as A and B (and C, ...). The test duplicates one of the fragments and presents it as X. The user must choose which, out of A or B (or C, ...), is closest to X.</description>
                 </descriptions>
             </test>
             <test name="timeline" interface="timeline">

--- a/tests/pool.xml	Sat Apr 15 12:06:19 2017 +0100
+++ b/tests/pool.xml	Wed Apr 19 09:30:47 2017 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
     <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-        <setup interface="likert" projectReturn="save.php" crossFade="3.0" poolSize="3">
+        <setup interface="discrete" projectReturn="save.php" crossFade="0.1" poolSize="3">
             <metric>
                 <metricenable>testTimer</metricenable>
                 <metricenable>elementTimer</metricenable>