Skip to content

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

maxScroll = round(maxScroll*.02 / fontSize))-1;

parent e1312e78
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 103 deletions
scroll-text-legacy-browsers.js
View file @ e86ecc04
......@@ -56,8 +56,6 @@ psychoJS.start({
psychoJS.experimentLogger.setLevel(core.Logger.ServerLevel.EXP);
var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
......@@ -77,27 +75,6 @@ function updateInfo() {
return Scheduler.Event.NEXT;
}
var startClock;
var thisExp;
var win;
var event;
var mouse;
var trialClock;
var screenRatio;
var fontSize;
var mouseY;
var trackLength;
var trackWidth;
var scrollText;
var scrollBar;
var scrollButton;
var bottomCrop;
var continueText;
var endClock;
var text;
var globalClock;
var routineTimer;
function experimentInit() {
// Initialize components for Routine "start"
startClock = new util.Clock();
......@@ -192,12 +169,6 @@ function experimentInit() {
return Scheduler.Event.NEXT;
}
var t;
var frameN;
var continueRoutine;
var gotValidClick;
var startComponents;
function startRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'start'-------
......@@ -221,7 +192,6 @@ function startRoutineBegin(snapshot) {
}
}
function startRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'start'-------
......@@ -255,7 +225,6 @@ function startRoutineEachFrame(snapshot) {
};
}
function startRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'start'-------
......@@ -270,14 +239,6 @@ function startRoutineEnd(snapshot) {
};
}
var scroll;
var lines;
var maxScroll;
var viewAll;
var dragging;
var moving;
var trialComponents;
function trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'trial'-------
......@@ -298,7 +259,7 @@ function trialRoutineBegin(snapshot) {
moving = 0;
scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
maxScroll *= round((.02 / fontSize));
maxScroll = round(maxScroll*.02 / fontSize))-1;
scrollText.setAlignHoriz('left');
scrollText.setAlignVert('top');
// keep track of which components have finished
......@@ -317,9 +278,6 @@ function trialRoutineBegin(snapshot) {
}
}
var _pj;
var keys;
function trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'trial'-------
......@@ -477,7 +435,6 @@ function trialRoutineEachFrame(snapshot) {
};
}
function trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'trial'-------
......@@ -493,8 +450,6 @@ function trialRoutineEnd(snapshot) {
};
}
var endComponents;
function endRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'end'-------
......@@ -515,7 +470,6 @@ function endRoutineBegin(snapshot) {
}
}
function endRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'end'-------
......@@ -559,7 +513,6 @@ function endRoutineEachFrame(snapshot) {
};
}
function endRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'end'-------
......@@ -575,7 +528,6 @@ function endRoutineEnd(snapshot) {
};
}
function endLoopIteration(scheduler, snapshot) {
// ------Prepare for next entry------
return function () {
......@@ -598,7 +550,6 @@ function endLoopIteration(scheduler, snapshot) {
};
}
function importConditions(currentLoop) {
return function () {
psychoJS.importAttributes(currentLoop.getCurrentTrial());
......@@ -606,7 +557,6 @@ function importConditions(currentLoop) {
};
}
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (psychoJS.experiment.isEntryEmpty()) {
......
scroll-text.js
View file @ e86ecc04
......@@ -67,8 +67,6 @@ psychoJS.start({
psychoJS.experimentLogger.setLevel(core.Logger.ServerLevel.EXP);
var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
......@@ -88,27 +86,6 @@ function updateInfo() {
return Scheduler.Event.NEXT;
}
var startClock;
var thisExp;
var win;
var event;
var mouse;
var trialClock;
var screenRatio;
var fontSize;
var mouseY;
var trackLength;
var trackWidth;
var scrollText;
var scrollBar;
var scrollButton;
var bottomCrop;
var continueText;
var endClock;
var text;
var globalClock;
var routineTimer;
function experimentInit() {
// Initialize components for Routine "start"
startClock = new util.Clock();
......@@ -203,12 +180,6 @@ function experimentInit() {
return Scheduler.Event.NEXT;
}
var t;
var frameN;
var continueRoutine;
var gotValidClick;
var startComponents;
function startRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'start'-------
......@@ -231,7 +202,6 @@ function startRoutineBegin(snapshot) {
}
}
function startRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'start'-------
......@@ -265,7 +235,6 @@ function startRoutineEachFrame(snapshot) {
};
}
function startRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'start'-------
......@@ -280,14 +249,6 @@ function startRoutineEnd(snapshot) {
};
}
var scroll;
var lines;
var maxScroll;
var viewAll;
var dragging;
var moving;
var trialComponents;
function trialRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'trial'-------
......@@ -308,7 +269,7 @@ function trialRoutineBegin(snapshot) {
moving = 0;
scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
maxScroll *= round((.02 / fontSize));
maxScroll = round(maxScroll*.02 / fontSize))-1;
scrollText.setAlignHoriz('left');
scrollText.setAlignVert('top');
// keep track of which components have finished
......@@ -326,9 +287,6 @@ function trialRoutineBegin(snapshot) {
}
}
var _pj;
var keys;
function trialRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'trial'-------
......@@ -486,7 +444,6 @@ function trialRoutineEachFrame(snapshot) {
};
}
function trialRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'trial'-------
......@@ -502,8 +459,6 @@ function trialRoutineEnd(snapshot) {
};
}
var endComponents;
function endRoutineBegin(snapshot) {
return function () {
//------Prepare to start Routine 'end'-------
......@@ -523,7 +478,6 @@ function endRoutineBegin(snapshot) {
}
}
function endRoutineEachFrame(snapshot) {
return function () {
//------Loop for each frame of Routine 'end'-------
......@@ -567,7 +521,6 @@ function endRoutineEachFrame(snapshot) {
};
}
function endRoutineEnd(snapshot) {
return function () {
//------Ending Routine 'end'-------
......@@ -583,7 +536,6 @@ function endRoutineEnd(snapshot) {
};
}
function endLoopIteration(scheduler, snapshot) {
// ------Prepare for next entry------
return function () {
......@@ -606,7 +558,6 @@ function endLoopIteration(scheduler, snapshot) {
};
}
function importConditions(currentLoop) {
return function () {
psychoJS.importAttributes(currentLoop.getCurrentTrial());
......@@ -614,7 +565,6 @@ function importConditions(currentLoop) {
};
}
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (psychoJS.experiment.isEntryEmpty()) {
......
scroll-text.psyexp
View file @ e86ecc04
......@@ -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((.02 / fontSize));&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="maxScroll = round(maxScroll*.02 / 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