Merge pull request #17 from brown-ccv/master

feat: master->main, bug fixes for trials
brown-ccv · Feb 9, 2021 · bfcc6eb · bfcc6eb
2 parents c08030b + fe977ab
commit bfcc6eb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -34,8 +34,9 @@ jobs:
       - name: Commit & Push changes
         uses: actions-js/push@master
         with:
-          message: Update Documentation.md
+          message: 'Update Documentation.md'
           github_token: ${{ secrets.GH_TOKEN }}
+          branch: 'main'
 
       - name: Release
         env:

diff --git a/trials/fixation.js b/trials/fixation.js
@@ -36,7 +36,7 @@ module.exports = function (config, options) {
     taskCode,
     numBlinks,
     buttons,
-  } = { defaults, ...options };
+  } = { ...defaults, ...options };
 
   let stimulus =
     '<div class="beads_container"><div id="fixation-dot"> </div></div>';

diff --git a/trials/showImage.js b/trials/showImage.js
@@ -41,7 +41,7 @@ module.exports = function (config, options) {
     responseEndsTrial,
     taskCode,
     numBlinks,
-  } = { defaults, ...options };
+  } = { ...defaults, ...options };
 
   return {
     type: responseType,

diff --git a/trials/showMessage.js b/trials/showMessage.js
@@ -42,7 +42,7 @@ module.exports = function (config, options) {
     taskCode,
     numBlinks,
     buttons,
-  } = { defaults, ...options };
+  } = { ...defaults, ...options };
 
   let stimulus = onstart ? baseStimulus(message) : baseStimulus(message, true);
   if (config.USE_PHOTODIODE) stimulus += photodiodeGhostBox();

diff --git a/trials/userId.js b/trials/userId.js
@@ -31,7 +31,7 @@ module.exports = function (jsPsych, config, options) {
     setIdMessage,
     responseEndsTrial,
     defaultPatientId,
-  } = { defaults, ...options };
+  } = { ...defaults, ...options };
 
   if (config.USE_MTURK) {
     return {