Commit 81d61c5b authored by David Bridges's avatar David Bridges

Updated version to 3.1.3

parent 7ec29526
......@@ -57,7 +57,7 @@ var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '3.1.0';
expInfo['psychopyVersion'] = '3.1.3';
// store frame rate of monitor if we can measure it successfully
expInfo['frameRate'] = psychoJS.window.getActualFrameRate();
......@@ -520,6 +520,10 @@ function endLoopIteration(thisScheduler, thisTrial) {
return function () {
// ------Check if user ended loop early------
if (currentLoop.finished) {
// Check for and save orphaned data
if (Object.keys(psychoJS.experiment._thisEntry).length > 0) {
psychoJS.experiment.nextEntry();
}
thisScheduler.stop();
} else if (typeof thisTrial === 'undefined' || !('isTrials' in thisTrial) || thisTrial.isTrials) {
psychoJS.experiment.nextEntry();
......@@ -540,6 +544,10 @@ function importConditions(loop) {
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (Object.keys(psychoJS.experiment._thisEntry).length > 0) {
psychoJS.experiment.nextEntry();
}
psychoJS.window.close();
psychoJS.quit({message: message, isCompleted: isCompleted});
......
......@@ -49,7 +49,7 @@ var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '3.1.0';
expInfo['psychopyVersion'] = '3.1.3';
// store frame rate of monitor if we can measure it successfully
expInfo['frameRate'] = psychoJS.window.getActualFrameRate();
......@@ -515,6 +515,10 @@ function endLoopIteration(thisScheduler, thisTrial) {
return function () {
// ------Check if user ended loop early------
if (currentLoop.finished) {
// Check for and save orphaned data
if (Object.keys(psychoJS.experiment._thisEntry).length > 0) {
psychoJS.experiment.nextEntry();
}
thisScheduler.stop();
} else if (typeof thisTrial === 'undefined' || !('isTrials' in thisTrial) || thisTrial.isTrials) {
psychoJS.experiment.nextEntry();
......@@ -535,6 +539,10 @@ function importConditions(loop) {
function quitPsychoJS(message, isCompleted) {
// Check for and save orphaned data
if (Object.keys(psychoJS.experiment._thisEntry).length > 0) {
psychoJS.experiment.nextEntry();
}
psychoJS.window.close();
psychoJS.quit({message: message, isCompleted: isCompleted});
......
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