Skip to content

Fixed Bugs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hysz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed Bugs #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e950ccb
Fixed Bug: results not saved to output file.
hysz Jun 25, 2013
26b34fe
fixed bug: embedded version not generating UID
hysz Jun 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions core/js/IAT.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
template = {};
sub = '';

results_saved = false;

function randomString(length) {
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
Expand All @@ -9,12 +9,16 @@ function randomString(length) {
return result;
}

function Is_embedded()
{
return template.hasOwnProperty( "running" ) && template.running == "embedded";
}

// Loads the input file and starts introduction
function initialize()
{

var tempsubID = randomString(10);

// get active template & load data into global variable
$.getJSON("templates/active.txt", function(input) {
document.title = input.active + " IAT";
Expand All @@ -25,12 +29,12 @@ function initialize()
//takes subID from URL location.search property
//expects something like http://www.server.com/IAT/index.php?subID=12345
//if no query is present, or if subID is empty (e.g., ?subID= ), subID defaults to 999+random string
if (template.running == "embedded")
if (Is_embedded())
{
tempsubID = getQueryVariable('subID');
if (tempsubID == "") {tempsubID="99999"+randomString(5)}
if (!tempsubID) {tempsubID="99999"+randomString(5)}
}

//change here to make instruct0 more flexible
//to go with standard instruct0.html, just leave running=""
$.get("core/instruct0"+template.running+".html", function(data) {
Expand All @@ -57,7 +61,7 @@ function getQueryVariable(variable)
return decodeURIComponent(pair[1]);
}
}
return(999999);
return null;
}

function loadInstructions(stage)
Expand Down Expand Up @@ -337,7 +341,7 @@ function instructionPage()
$("#left_cat").html("");
$("#right_cat").html("");
$("#exp_instruct").html("<img src='core/spinner.gif'>");
WriteFile();

if(template.showResult == "show")
{
calculateIAT();
Expand All @@ -348,12 +352,8 @@ function instructionPage()
$("#picture_frame").html(resulttext);

}

//crude hack for forwarding by TS
if (template.running == "embedded")
{
window.location.href = template.nextURL + sub;
}

WriteFile();
}
else
{
Expand Down Expand Up @@ -593,8 +593,19 @@ function WriteFile()
}
}

$.post("core/fileManager.php", { 'op':'writeoutput', 'template':template.name,
'subject': subject, 'data': str });
$.post("core/fileManager.php", { 'op':'writeoutput', 'template':template.name, 'subject': subject, 'data': str }, WriteFile_success, "json");
}

function WriteFile_success(response)
{
results_saved = true;

//crude hack for forwarding by TS
if (Is_embedded())
{
window.location.href = template.nextURL + sub;
}

// notify user of success?
}

Expand Down