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: Add endBlock file and move trials into it #388

Merged
merged 5 commits into from
Feb 2, 2024
Merged

ref: Add endBlock file and move trials into it #388

merged 5 commits into from
Feb 2, 2024

Conversation

RobertGemmaJr
Copy link
Member

@RobertGemmaJr RobertGemmaJr commented Jan 30, 2024 •
edited
Loading

  • Adds an endBlock.js file for trials needed to conclude the experiment
  • Renames finishTrial as conclusionTrial
  • Moves conclusionTrial in trials/conclusion.js
  • Moves exitFullScreenTrial and conclusionTrial into endBlock.js
  • Moves buildCameraEndTrial into endBlock
  • Renames finish sentence to conclusion
  • Moves welcome and conclusion sentences into LANGUAGE.trials
  • Renames timeline variable as __Block when building a block (e.g. startBlock.js and endBlock.js
  • Adds the NO_KEYS choice to fixation trial, better matches the other "message" trials

closes #367

@RobertGemmaJr RobertGemmaJr self-assigned this Jan 30, 2024
@RobertGemmaJr RobertGemmaJr linked an issue Jan 30, 2024 that may be closed by this pull request
Add endBlock trial block #367
Closed
3 tasks
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 30, 2024 •
edited
Loading

Visit the preview URL for this PR (updated for commit 0bff413):

https://ccv-honeycomb--pr388-ref-endblock-g93cdlux.web.app

(expires Tue, 06 Feb 2024 17:15:05 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 4ace1dcea913a952d2a1af84b94a4421bf36e610

@RobertGemmaJr RobertGemmaJr linked an issue Jan 30, 2024 that may be closed by this pull request
Turn showName and showWelcome into NO_KEYS trials #292
Closed
@RobertGemmaJr RobertGemmaJr added the 3.3 Versioning: Issue in regards to version 3.3 release label Feb 1, 2024
Base automatically changed from rename-preamble to feat-v3.3 February 2, 2024 20:31
@RobertGemmaJr RobertGemmaJr merged commit 375f2a8 into feat-v3.3 Feb 2, 2024
8 checks passed
@RobertGemmaJr RobertGemmaJr deleted the ref-endBlock branch February 2, 2024 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@galenwinsor galenwinsor galenwinsor approved these changes

@eldu eldu Awaiting requested review from eldu

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

@broarr broarr Awaiting requested review from broarr

Assignees

@RobertGemmaJr RobertGemmaJr

Labels
3.3 Versioning: Issue in regards to version 3.3 release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add endBlock trial block Turn showName and showWelcome into NO_KEYS trials
2 participants
@RobertGemmaJr @galenwinsor