✨ examples in instructions (WIP #1)

LabNeuroCogDevel · May 26, 2020 · f6deef9 · f6deef9
1 parent 699a66e
commit f6deef9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 9 deletions.
diff --git a/index.html b/index.html
@@ -21,8 +21,8 @@
     <script src="static/js/jspsych/plugins/jspsych-html-keyboard-response.js" type="text/javascript"></script>
     <script src="static/js/jspsych/plugins/jspsych-survey-text.js" type="text/javascript"></script>
     <script src="static/js/jspsych/plugins/jspsych-survey-multi-choice.js" type="text/javascript"></script>
-    <script src="static/js/instructions.js" type="text/javascript"> </script>
     <script src="static/js/utils.js" type="text/javascript"> </script>
+    <script src="static/js/instructions.js" type="text/javascript"> </script>
     <script src="static/js/task.js" type="text/javascript"> </script>
 
     <script type="text/javascript">
@@ -81,8 +81,10 @@
 }
 
 function init(){
-   fdbktl(1);
+   //fdbktl(1);
+   showInstructions('ID_wf');
    //trials(fullTL);
+
 }
     </script>
 

diff --git a/static/js/instructions.js b/static/js/instructions.js
diff --git a/static/js/utils.ts b/static/js/utils.ts
@@ -1,5 +1,5 @@
 declare var jsPsych: any;
-declare var FRTS: any; // fruits as they were ordered
+declare var FRTS: {[key: string]: Fruit; }[]; // e.g. 'apple' => Fruit. see fruits()
 declare var uniqueId: any;
 declare var psiturk: any;
 //declare var $: any;   //jquery

diff --git a/templates/exp.html b/templates/exp.html
@@ -33,8 +33,8 @@
 
 
       <script src="/static/js/psiturk.js" type="text/javascript"> </script>
-      <script src="/static/js/instructions.js" type="text/javascript"> </script>
       <script src="/static/js/utils.js" type="text/javascript"> </script>
+      <script src="/static/js/instructions.js" type="text/javascript"> </script>
       <script src="/static/js/task.js" type="text/javascript"> </script>
 
 		<script type="text/javascript">