From 91f5c86adc3f363484d862b7c28153fd83eeb033 Mon Sep 17 00:00:00 2001 From: Sotiri Bakagiannis Date: Wed, 19 May 2021 17:18:47 +0100 Subject: [PATCH 1/2] data/TrialHandler: add next method, trialIterator getter --- src/data/TrialHandler.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/data/TrialHandler.js b/src/data/TrialHandler.js index 4cba062..995bfde 100644 --- a/src/data/TrialHandler.js +++ b/src/data/TrialHandler.js @@ -122,6 +122,21 @@ export class TrialHandler extends PsychObject } + get trialIterator() { + return this[Symbol.iterator](); + } + + + /** + * Helps go through each trial in the sequence one by one, mirrors PsychoPy. + */ + next() { + const { value } = this.trialIterator.next(); + + return value; + } + + /** * Iterator over the trial sequence. * From ee1edfa99c9e92b011e861b8813a905554130622 Mon Sep 17 00:00:00 2001 From: Sotiri Bakagiannis Date: Tue, 25 May 2021 09:35:55 +0100 Subject: [PATCH 2/2] data/TrialHandler: drop the getter on trialIterator --- src/data/TrialHandler.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/data/TrialHandler.js b/src/data/TrialHandler.js index 995bfde..fedf407 100644 --- a/src/data/TrialHandler.js +++ b/src/data/TrialHandler.js @@ -122,16 +122,12 @@ export class TrialHandler extends PsychObject } - get trialIterator() { - return this[Symbol.iterator](); - } - - /** * Helps go through each trial in the sequence one by one, mirrors PsychoPy. */ next() { - const { value } = this.trialIterator.next(); + const trialIterator = this[Symbol.iterator](); + const { value } = trialIterator.next(); return value; }