jspsych 7.3.0 → 7.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspsych",
-  "version": "7.3.0",
+  "version": "7.3.2",
   "description": "Behavioral experiments in a browser",
   "type": "module",
   "main": "dist/index.cjs",

package/src/JsPsych.ts

@@ -781,7 +781,14 @@ export 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 === 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
@@ -789,13 +796,7 @@ export class JsPsych {
               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."
+                    `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;
@@ -809,11 +810,7 @@ export class JsPsych {
       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."
+            `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;

package/src/modules/plugin-api/MediaAPI.ts

@@ -102,15 +102,15 @@ export class MediaAPI {
           }
         );
       };
-      request.onerror = function (e) {
+      request.onerror = (e) => {
         let err: ProgressEvent | string = 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" });
         }
       };
@@ -176,24 +176,24 @@ export class MediaAPI {
       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];
+      img.src = src;
 
-      this.img_cache[images[i]] = img;
+      this.img_cache[src] = img;
       this.preload_requests.push(img);
     }
   }
@@ -221,9 +221,9 @@ export 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);
@@ -232,15 +232,15 @@ export class MediaAPI {
           }
         }
       };
-      request.onerror = function (e) {
+      request.onerror =  (e) => {
         let err: ProgressEvent | string = 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" });
         }
       };

package/src/modules/randomization.ts

@@ -120,6 +120,7 @@ export function shuffleNoRepeats(arr: Array<any>, equalityTest: (a: any, b: any)
   }
 
   const random_shuffle = shuffle(arr);
+
   for (let i = 0; i < random_shuffle.length - 1; i++) {
     if (equalityTest(random_shuffle[i], random_shuffle[i + 1])) {
       // neighbors are equal, pick a new random neighbor to swap (not the first or last element, to avoid edge cases)
@@ -128,7 +129,8 @@ export function shuffleNoRepeats(arr: Array<any>, equalityTest: (a: any, b: any)
       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;
       }