Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ref: Clean up JsPsychExperiment code #352

Merged
merged 10 commits into from
Dec 11, 2023
Merged

ref: Clean up JsPsychExperiment code #352

merged 10 commits into from
Dec 11, 2023

Conversation

RobertGemmaJr
Copy link
Member

@RobertGemmaJr RobertGemmaJr commented Dec 8, 2023 •
edited
Loading

  • Remove unneeded event listeners
  • Moves taskVersion import directly into JsPsychExperiment
  • Moves merging of jsPsychOptions to inside the memo
  • on_data_uptdate and on_finish options are now properly merged
  • buildTimeline is moved inside the useEffect
  • Removes the task's default "inter-trial interval" (most labs have asked to remove this anyways)

@RobertGemmaJr RobertGemmaJr self-assigned this Dec 8, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 8, 2023 •
edited
Loading

Visit the preview URL for this PR (updated for commit 847c956):

https://ccv-honeycomb--pr352-ref-jspsychexperimen-p703z9yr.web.app

(expires Mon, 18 Dec 2023 14:55:45 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 4ace1dcea913a952d2a1af84b94a4421bf36e610

RobertGemmaJr
RobertGemmaJr commented Dec 8, 2023
View reviewed changes
src/App/components/JsPsychExperiment.jsx Outdated Show resolved Hide resolved
src/timelines/main.js Outdated Show resolved Hide resolved
@RobertGemmaJr RobertGemmaJr marked this pull request as ready for review December 8, 2023 21:45
eldu
eldu approved these changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@eldu eldu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@RobertGemmaJr RobertGemmaJr merged commit 5438d34 into main Dec 11, 2023
8 checks passed
@RobertGemmaJr RobertGemmaJr deleted the ref-jsPsychExperiment branch December 11, 2023 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eldu eldu eldu approved these changes

@digicosmos86 digicosmos86 Awaiting requested review from digicosmos86

@anna-murphy anna-murphy Awaiting requested review from anna-murphy

@broarr broarr Awaiting requested review from broarr

Assignees

@RobertGemmaJr RobertGemmaJr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RobertGemmaJr @eldu