jspsych 7.3.0 → 7.3.1

package/dist/index.js

@@ -67,7 +67,7 @@ var autoBind = (self, {include, exclude} = {}) => {
 	return self;
 };
 
-var version = "7.3.0";
+var version = "7.3.1";
 
 class MigrationError extends Error {
     constructor(message = "The global `jsPsych` variable is no longer available in jsPsych v7.") {
@@ -900,15 +900,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" });
                 }
             };
@@ -965,20 +965,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);
         }
     }
@@ -996,9 +997,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);
@@ -1007,15 +1008,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" });
                 }
             };
@@ -1872,7 +1873,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];