resolve merge conflict

README.md

@@ -25,4 +25,4 @@ Citation
 
 If you use this library in academic work, please cite the [paper that describes jsPsych](http://link.springer.com/article/10.3758%2Fs13428-014-0458-y)
 
-de Leeuw, J.R. (2014). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*. Advance online publication. doi:10.3758/s13428-014-0458-y
+de Leeuw, J.R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*, _47_(1), 1-12. doi:10.3758/s13428-014-0458-y

css/jspsych.css

@@ -1,7 +1,7 @@
-/* 
+/*
  * CSS for jsPsych experiments.
  *
- * This stylesheet provides minimal styling to make jsPsych 
+ * This stylesheet provides minimal styling to make jsPsych
  * experiments look polished without any additional styles.
  *
  */
@@ -11,8 +11,8 @@
  * fonts and type
  *
  */
- 
-@import url(//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
+
+@import url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
 
 html {
  font-family: 'Open Sans', 'Arial', sans-serif;
@@ -50,7 +50,7 @@ p {
  * Classes for changing location of things
  *
  */
- 
+
 .left {
     float: left;
 }
@@ -116,7 +116,7 @@ button:hover {
 }
 
 #jspsych-progressbar-container s {
-	
+
 }
 
 #jspsych-progressbar-outer {
@@ -188,13 +188,34 @@ button:hover {
     border: 2px solid #444;
 }
 
+.jspsych-free-sort-draggable {
+  cursor: move;
+}
+
+#jspsych-free-sort-done-btn {
+  display: block;
+  margin: auto;
+  margin-top: 25px;
+}
+
+/*
+ *
+ * PLUGIN: jspsych-multi-stim-multi-response
+ *
+ */
+
+#jspsych-multi-stim-multi-response-stimulus {
+  display: block;
+  margin: auto;
+}
+
 /*
  *
  * PLUGIN: jspsych-palmer
  *
  */
 
-#jspsych-palmer-raphaelCanvas {
+#jspsych-palmer-snapCanvas {
     margin-left: auto;
     margin-right: auto;
 }
@@ -204,7 +225,7 @@ button:hover {
  * PLUGIN: jspsych-same-different
  *
  */
- 
+
 .jspsych-same-different-stimulus {
     display: block;
     margin-left: auto;
@@ -213,50 +234,86 @@ button:hover {
 
 /*
  *
- * PLUGIN: jspsych-visual-search-circle
+ * PLUGIN: jspsych-single-stim
  *
  */
- 
-#jspsych-visual-search-circle-svg {
+
+#jspsych-single-stim-stimulus {
     display: block;
     margin-left: auto;
     margin-right: auto;
 }
 
 /*
  *
- * PLUGIN: jspsych-single-stim
+ * PLUGIN: jspsych-survey-text
  *
  */
-
-#jspsych-single-stim-stimulus {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
+
+ .jspsych-survey-text {
+     margin: 0.25em 0em;
+ }
+
+ .jspsych-survey-text-question {
+     margin: 2em 0em;
+ }
+
+ /*
+  *
+  * PLUGIN: jspsych-survey-likert
+  *
+  */
+
+.jspsych-survey-likert-sliderlabels {
+  font-size: 75%;
+  line-height: 1.15em;
+}
+
+.jspsych-survey-likert-question {
+  margin-top: 2em;
+  margin-bottom: 2em;
+}
+
+.jspsych-survey-likert-text {
+  text-align: center;
+}
+
+#jspsych-survey-likert-next {
+  display: block;
+  margin: auto;
+}
+
+/*
+*
+* PLUGIN: jspsych-visual-search-circle
+*
+*/
+
+#jspsych-visual-search-circle-svg {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 /*
  *
- * PLUGIN: jspsych-xab
+ * PLUGIN: jspsych-vsl-animate-occlusion
  *
  */
-
-.jspsych-xab-stimulus {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
+
+#jspsych-vsl-animate-occlusion-canvas {
+  display: block;
+  margin: auto;
 }
 
 /*
  *
- * PLUGIN: jspsych-survey-text
+ * PLUGIN: jspsych-xab
  *
  */
-
- .jspsych-survey-text {
-     margin: 0.25em 0em;
- }
-
- .jspsych-survey-text-question {
-     margin: 2em 0em;
+
+ .jspsych-xab-stimulus {
+   display: block;
+   margin-left: auto;
+   margin-right: auto;
  }

docs/markdown_docs/about/about.md

@@ -4,9 +4,8 @@ jsPsych was created by [Josh de Leeuw](http://pages.iu.edu/~jodeleeu) at Indiana
 
 ### Citation
 
-de Leeuw, J. R. (2014). jsPsych: A JavaScript library for creating behavioral experiments in a web browser. _Behavior Research Methods_, Advance online publication. doi:10.3758/s13428-014-0458-y.
+de Leeuw, J. R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a web browser. _Behavior Research Methods_, _47_(1), 1-12. doi:10.3758/s13428-014-0458-y.
 
 ---
 
-Documentation generated with [mkdocs](http://www.mkdocs.org) 
-
+Documentation generated with [mkdocs](http://www.mkdocs.org)

docs/markdown_docs/core_library/jspsych-core.md

@@ -15,7 +15,7 @@ None.
 
 Returns the chunk ID of the chunk that is currently active.
 
-### Description 
+### Description
 
 Gets the chunk ID of the active chunk. The chunk ID is a string that follows a specific format:
 
@@ -61,7 +61,7 @@ None.
 
 Returns the object describing the current trial. The object will contain all of the parameters associated with the current trial.
 
-### Description 
+### Description
 
 Get a description of the current trial
 
@@ -88,7 +88,7 @@ None.
 
 Returns nothing.
 
-### Description 
+### Description
 
 This method tells jsPsych that the current trial is over. It is used in all of the plugins to end the current trial. When the trial ends a few things happen:
 
@@ -121,7 +121,7 @@ None.
 
 Returns the jQuery-object that contains the DOM element used for displaying the experiment.
 
-### Description 
+### Description
 
 Get the DOM element that displays the experiment.
 
@@ -157,15 +157,16 @@ on_trial_start | function | Function to execute when a new trial begins.
 on_trial_finish | function | Function to execute when a trial ends.
 on_data_update | function | Function to execute every time data is stored using the `jsPsych.data.write` method. All plugins use this method to save data, so this function runs every time a plugin stores new data.
 show_progress_bar | boolean | If true, then [a progress bar](../features/progress-bar.md) is shown at the top of the page.
-
+max_load_time | numeric | The maximum number of milliseconds to wait for audio content to preload. If the wait time is exceeded, then an error message is logged and the experiment stops. The default value is 30 seconds.
+skip_load_check | boolean | If true, then the experiment will not wait for audio content to load before starting. The default value is false.
 
 ### Return value
 
 Returns nothing.
 
-### Description 
+### Description
 
-This method configures and starts the experiment. 
+This method configures and starts the experiment.
 
 ### Example
 
@@ -187,9 +188,9 @@ None
 
 Returns the settings object used to initialize the experiment.
 
-### Description 
+### Description
 
-Gets the object containing the settings for the current experiment. 
+Gets the object containing the settings for the current experiment.
 
 ### Example
 
@@ -218,7 +219,7 @@ callback_load | function | A function to execute after each image has been loade
 
 Returns nothing.
 
-### Description 
+### Description
 
 Use this function to preload image files. See [Image Preloading](../features/image-preloading.md) in the documentation.
 
@@ -252,7 +253,7 @@ jsPsych.preloadImages(images, function(){ startExperiment(); }, function(nLoaded
 
 function updateLoadedCount(nLoaded){
 	var percentcomplete = nLoaded / images.length * 100;
-	
+
 	// could put something fancier here, like a progress bar
 	// or updating text in the DOM.
 	console.log('Loaded '+percentcomplete+'% of images');
@@ -288,7 +289,7 @@ total_chunks | numeric | Returns the total number of top-level chunks. (Chunks e
 current_chunk | numeric | Returns the index of the current top-level chunk.
 
 
-### Description 
+### Description
 
 This method returns information about the length of the experiment and the subject's current location in the experiment timeline.
 
@@ -318,7 +319,7 @@ None.
 
 Returns a `Date` object indicating when the experiment began.
 
-### Description 
+### Description
 
 Get the time that the experiment began.
 
@@ -342,7 +343,7 @@ None.
 
 Returns a numeric value indicating the number of milliseconds since `jsPsych.init` was called.
 
-### Description 
+### Description
 
 Gets the total time the subject has been in the experiment.
 
@@ -353,7 +354,3 @@ Gets the total time the subject has been in the experiment.
 var time = jsPsych.totalTime();
 
 ```
-
-
-
-