Commit 26008a8a authored by Cody Ede (cme527)'s avatar Cody Ede (cme527)
Browse files

slightly broken, slightly working.

parent 95f149b1
......@@ -22,12 +22,12 @@ InstructionsTrial.prototype.start = function() {
this.experiment.modalDialog.setButtonVisible(!this.hidebutton);
this.experiment.modalDialog.setButtonEnabled(this.timeout == 0);
this.handleButtonClick = function(data) {
var clickPos = data.getLocalPosition(this.experiment.view);
this.handleButtonClick = function(derp) {
var clickPos = derp.data.getLocalPosition(this.experiment.view);
StudyLogger.logEvent({type: 'event.closeinstructions',
message: this.message,
clickGlobalX: data.global.x,
clickGlobalY: data.global.y,
clickGlobalX: derp.global.x,
clickGlobalY: derp.global.y,
clickExpX: clickPos.x,
clickExpY: clickPos.y});
this.experiment.modalDialog.close();
......@@ -54,4 +54,4 @@ InstructionsTrial.prototype.update = function(delta) {
}
};
module.exports = InstructionsTrial;
\ No newline at end of file
module.exports = InstructionsTrial;
......@@ -47,7 +47,7 @@ ModalDialog.prototype.close = function() {
};
ModalDialog.prototype.setMessage = function(s) {
this.message.setText(s);
this.message.text = s;
this.updateLayout();
};
......
Supports Markdown
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