Skip to content

S
Scroll Text
Commit b3a65993 authored by Wakefield Morys-Carter's avatar Wakefield Morys-Carter
Browse files
Options

remove maxScroll adjustment online

parent 092da935
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
scroll-text-legacy-browsers.js
View file @ b3a65993
......@@ -298,7 +298,7 @@ function trialRoutineBegin(snapshot) {
moving = 0;
scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
maxScroll -= (round((1.6 / fontSize)) - 1);
//maxScroll -= (round((1.6 / fontSize)) - 1);
scrollText.setAlignHoriz('left');
scrollText.setAlignVert('top');
// keep track of which components have finished
......
scroll-text.js
View file @ b3a65993
......@@ -308,7 +308,7 @@ function trialRoutineBegin(snapshot) {
moving = 0;
scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
maxScroll -= (round((1.6 / fontSize)) - 1);
//maxScroll -= (round((1.6 / fontSize)) - 1);
scrollText.setAlignHoriz('left');
scrollText.setAlignVert('top');
// keep track of which components have finished
......
scroll-text.psyexp
View file @ b3a65993
......@@ -143,7 +143,7 @@
<Param name="Before JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin Experiment" updates="constant" val="import math" valType="extendedCode"/>
<Param name="Begin JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="maxScroll -= (round((1.6 / fontSize)) - 1);&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="//maxScroll -= (round((1.6 / fontSize)) - 1);&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
<Param name="Begin Routine" updates="constant" val="maxScroll-=round(1.5/fontSize)-1&amp;#10;scrollText.anchorHoriz='left'&amp;#10;scrollText.anchorVert='top'&amp;#10;scrollText.alignText='left'" valType="extendedCode"/>
<Param name="Code Type" updates="None" val="Both" valType="str"/>
<Param name="Each Frame" updates="constant" val="" valType="extendedCode"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment