Commit a6c4c5f0 authored by Athena X's avatar Athena X

deleted shif flag

parent 3eb46ede
File mode changed from 100755 to 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -129,7 +129,7 @@ var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '2020.1.2';
expInfo['psychopyVersion'] = '2020.1.1';
expInfo['OS'] = window.navigator.platform;
// store frame rate of monitor if we can measure it successfully
......@@ -160,7 +160,6 @@ var image_pre;
var screenText;
var cornerText;
var allLetters;
var shift_flag;
var key_resp;
var pre2_EinClock;
var key_resp_7;
......@@ -315,7 +314,6 @@ function experimentInit() {
});
allLetters = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "g", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "z", "y", "\u00f6", "\u00e4", "\u00df", "\u00fc"];
shift_flag = false;
key_resp = new core.Keyboard({psychoJS: psychoJS, clock: new util.Clock(), waitForStart: true});
......@@ -366,7 +364,6 @@ function experimentInit() {
});
allLetters = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "g", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "z", "y", "\u00f6", "\u00e4", "\u00df", "\u00fc"];
shift_flag = false;
key_resp = new core.Keyboard({psychoJS: psychoJS, clock: new util.Clock(), waitForStart: true});
......@@ -1314,7 +1311,6 @@ function PreRoutineBegin(trials) {
var _pj;
var keys;
function PreRoutineEachFrame(trials) {
return function () {
//------Loop for each frame of Routine 'Pre'-------
......@@ -1375,10 +1371,6 @@ function PreRoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
shift_flag;
console.log("event: ");
console.log(event);
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -2218,16 +2210,6 @@ function ps8RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -2580,16 +2562,6 @@ function ps10RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -3062,16 +3034,6 @@ function PostRoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -3662,16 +3624,6 @@ function Post18RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -4024,16 +3976,6 @@ function Post20RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -4327,16 +4269,6 @@ function Umfrage1RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -4593,16 +4525,6 @@ function Umfrage2RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......
......@@ -137,7 +137,7 @@ var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '2020.1.2';
expInfo['psychopyVersion'] = '2020.1.1';
expInfo['OS'] = window.navigator.platform;
// store frame rate of monitor if we can measure it successfully
......@@ -168,7 +168,6 @@ var image_pre;
var screenText;
var cornerText;
var allLetters;
var shift_flag;
var key_resp;
var pre2_EinClock;
var key_resp_7;
......@@ -323,7 +322,6 @@ function experimentInit() {
});
allLetters = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "g", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "z", "y", "\u00f6", "\u00e4", "\u00df", "\u00fc"];
shift_flag = false;
key_resp = new core.Keyboard({psychoJS: psychoJS, clock: new util.Clock(), waitForStart: true});
......@@ -374,7 +372,6 @@ function experimentInit() {
});
allLetters = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "g", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "z", "y", "\u00f6", "\u00e4", "\u00df", "\u00fc"];
shift_flag = false;
key_resp = new core.Keyboard({psychoJS: psychoJS, clock: new util.Clock(), waitForStart: true});
......@@ -1314,7 +1311,6 @@ function PreRoutineBegin(trials) {
var _pj;
var keys;
function PreRoutineEachFrame(trials) {
return function () {
//------Loop for each frame of Routine 'Pre'-------
......@@ -1375,10 +1371,6 @@ function PreRoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
shift_flag;
console.log("event: ");
console.log(event);
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -2212,16 +2204,6 @@ function ps8RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -2572,16 +2554,6 @@ function ps10RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -3051,16 +3023,6 @@ function PostRoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -3647,16 +3609,6 @@ function Post18RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -4007,16 +3959,6 @@ function Post20RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -4308,16 +4250,6 @@ function Umfrage1RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......@@ -4573,16 +4505,6 @@ function Umfrage2RoutineEachFrame(trials) {
}
_pj = {};
_pj_snippets(_pj);
try {
shift_flag;
} catch(e) {
if ((e instanceof NameError)) {
shift_flag = false;
} else {
throw e;
}
}
keys = event.getKeys();
if (_pj.in_es6("escape", keys)) {
core.quit();
} else {
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
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