jspsych 7.3.0 → 7.3.2

package/dist/index.cjs

@@ -71,7 +71,7 @@ var autoBind = (self, {include, exclude} = {}) => {
 	return self;
 };
 
-var version = "7.3.0";
+var version = "7.3.2";
 
 class MigrationError extends Error {
     constructor(message = "The global `jsPsych` variable is no longer available in jsPsych v7.") {
@@ -904,15 +904,15 @@ class MediaAPI {
                     callback_error({ source: source, error: e });
                 });
             };
-            request.onerror = function (e) {
+            request.onerror = (e) => {
                 let err = e;
-                if (this.status == 404) {
+                if (request.status == 404) {
                     err = "404";
                 }
                 callback_error({ source: source, error: err });
             };
-            request.onloadend = function (e) {
-                if (this.status == 404) {
+            request.onloadend = (e) => {
+                if (request.status == 404) {
                     callback_error({ source: source, error: "404" });
                 }
             };
@@ -969,20 +969,21 @@ class MediaAPI {
             callback_complete();
             return;
         }
-        for (var i = 0; i < images.length; i++) {
-            var img = new Image();
-            img.onload = function () {
+        for (let i = 0; i < images.length; i++) {
+            const img = new Image();
+            const src = images[i];
+            img.onload = () => {
                 n_loaded++;
-                callback_load(img.src);
+                callback_load(src);
                 if (n_loaded === images.length) {
                     callback_complete();
                 }
             };
-            img.onerror = function (e) {
-                callback_error({ source: img.src, error: e });
+            img.onerror = (e) => {
+                callback_error({ source: src, error: e });
             };
-            img.src = images[i];
-            this.img_cache[images[i]] = img;
+            img.src = src;
+            this.img_cache[src] = img;
             this.preload_requests.push(img);
         }
     }
@@ -1000,9 +1001,9 @@ class MediaAPI {
             const request = new XMLHttpRequest();
             request.open("GET", video, true);
             request.responseType = "blob";
-            request.onload = function () {
-                if (this.status === 200 || this.status === 0) {
-                    const videoBlob = this.response;
+            request.onload = () => {
+                if (request.status === 200 || request.status === 0) {
+                    const videoBlob = request.response;
                     video_buffers[video] = URL.createObjectURL(videoBlob); // IE10+
                     n_loaded++;
                     callback_load(video);
@@ -1011,15 +1012,15 @@ class MediaAPI {
                     }
                 }
             };
-            request.onerror = function (e) {
+            request.onerror = (e) => {
                 let err = e;
-                if (this.status == 404) {
+                if (request.status == 404) {
                     err = "404";
                 }
                 callback_error({ source: video, error: err });
             };
-            request.onloadend = function (e) {
-                if (this.status == 404) {
+            request.onloadend = (e) => {
+                if (request.status == 404) {
                     callback_error({ source: video, error: "404" });
                 }
             };
@@ -1876,7 +1877,8 @@ function shuffleNoRepeats(arr, equalityTest) {
             // test to make sure the new neighbor isn't equal to the old one
             while (equalityTest(random_shuffle[i + 1], random_shuffle[random_pick]) ||
                 equalityTest(random_shuffle[i + 1], random_shuffle[random_pick + 1]) ||
-                equalityTest(random_shuffle[i + 1], random_shuffle[random_pick - 1])) {
+                equalityTest(random_shuffle[i + 1], random_shuffle[random_pick - 1]) ||
+                equalityTest(random_shuffle[i], random_shuffle[random_pick])) {
                 random_pick = Math.floor(Math.random() * (random_shuffle.length - 2)) + 1;
             }
             const new_neighbor = random_shuffle[random_pick];
@@ -3187,20 +3189,21 @@ class JsPsych {
         for (const param in trial.type.info.parameters) {
             // check if parameter is complex with nested defaults
             if (trial.type.info.parameters[param].type === exports.ParameterType.COMPLEX) {
-                if (trial.type.info.parameters[param].array === true) {
+                // check if parameter is undefined and has a default value
+                if (typeof trial[param] === "undefined" && trial.type.info.parameters[param].default) {
+                    trial[param] = trial.type.info.parameters[param].default;
+                }
+                // if parameter is an array, iterate over each entry after confirming that there are
+                // entries to iterate over. this is common when some parameters in a COMPLEX type have
+                // default values and others do not.
+                if (trial.type.info.parameters[param].array === true && Array.isArray(trial[param])) {
                     // iterate over each entry in the array
                     trial[param].forEach(function (ip, i) {
                         // check each parameter in the plugin description
                         for (const p in trial.type.info.parameters[param].nested) {
                             if (typeof trial[param][i][p] === "undefined" || trial[param][i][p] === null) {
                                 if (typeof trial.type.info.parameters[param].nested[p].default === "undefined") {
-                                    console.error("You must specify a value for the " +
-                                        p +
-                                        " parameter (nested in the " +
-                                        param +
-                                        " parameter) in the " +
-                                        trial.type +
-                                        " plugin.");
+                                    console.error(`You must specify a value for the ${p} parameter (nested in the ${param} parameter) in the ${trial.type.info.name} plugin.`);
                                 }
                                 else {
                                     trial[param][i][p] = trial.type.info.parameters[param].nested[p].default;
@@ -3213,11 +3216,7 @@ class JsPsych {
             // if it's not nested, checking is much easier and do that here:
             else if (typeof trial[param] === "undefined" || trial[param] === null) {
                 if (typeof trial.type.info.parameters[param].default === "undefined") {
-                    console.error("You must specify a value for the " +
-                        param +
-                        " parameter in the " +
-                        trial.type.info.name +
-                        " plugin.");
+                    console.error(`You must specify a value for the ${param} parameter in the ${trial.type.info.name} plugin.`);
                 }
                 else {
                     trial[param] = trial.type.info.parameters[param].default;