diff --git a/controllers/prototype/dbrequests.js b/controllers/prototype/dbrequests.js index 6bbb43e..da5a5f4 100644 --- a/controllers/prototype/dbrequests.js +++ b/controllers/prototype/dbrequests.js @@ -1616,6 +1616,6 @@ DBReq.verifyUser = function() { construct(DBReq.UserVerifier, arguments); }; * * @memberof DBReq */ -DBReq.getUser = function() { construct(DBReq.UserGetter, arguments); } +DBReq.getUser = function() { construct(DBReq.UserGetter, arguments); }; module.exports = DBReq; diff --git a/js/l3d/apps/prototype/interactive/main.js b/js/l3d/apps/prototype/interactive/main.js index 2818991..5798439 100644 --- a/js/l3d/apps/prototype/interactive/main.js +++ b/js/l3d/apps/prototype/interactive/main.js @@ -5,7 +5,7 @@ var onWindowResize = (function() { L3D.ProgressiveLoader.onFinished = function() { - if (coins.length === 0 || coins[0].mesh == undefined) { + if (coins.length === 0 || coins[0].mesh === undefined) { setTimeout(L3D.ProgressiveLoader.onFinished, 500); return; } @@ -17,7 +17,7 @@ L3D.ProgressiveLoader.onFinished = function() { loadingCanvas.clear(); L3D.DB.enable(); camera1.reset(); -} +}; // Disable scrolling window.onscroll = function () { window.scrollTo(0, 0); }; diff --git a/js/l3d/apps/prototype/tutorial/main.js b/js/l3d/apps/prototype/tutorial/main.js index 73ea89f..953de29 100644 --- a/js/l3d/apps/prototype/tutorial/main.js +++ b/js/l3d/apps/prototype/tutorial/main.js @@ -36,7 +36,7 @@ window.onbeforeunload = function() { } -} +}; function main() { diff --git a/lib/vcode.js b/lib/vcode.js index 624e60c..976e4d0 100644 --- a/lib/vcode.js +++ b/lib/vcode.js @@ -6,4 +6,4 @@ module.exports = function(workerId) { return 'mw-' + hash(campaignId + workerId + secretKey); -} +}; diff --git a/utils/load/load.js b/utils/load/load.js index a7086bd..9ab608a 100644 --- a/utils/load/load.js +++ b/utils/load/load.js @@ -1,5 +1,5 @@ -// var baseUrl = 'http://localhost:4000/'; -var baseUrl = 'http://3dinterface.no-ip.org/'; +var baseUrl = 'http://localhost:4000/'; +// var baseUrl = 'http://3dinterface.no-ip.org/'; function makeId() { @@ -23,38 +23,39 @@ var limit = 1000; casper.start(baseUrl); -for (var i = 0; i < limit; i++) { +function addLevel(i) { - (function(i) { + casper.thenOpen(baseUrl + 'user-study', function() { - casper.thenOpen(baseUrl + 'user-study', function() { + console.log(i); - console.log(i); + this.getHTML(); - this.getHTML(); + // this.waitForSelector('form#form', function() { - // this.waitForSelector('form#form', function() { - - this.fillSelectors( - 'form#form', { - '#inputId': makeId(), - '#sel1': '-15', - '#sel2': '3' - }, true + this.fillSelectors( + 'form#form', { + '#inputId': makeId(), + '#sel1': '-15', + '#sel2': '3' + }, true ); - // }, true); + // }, true); - this.thenOpen(baseUrl + 'prototype/tutorial'); - this.thenOpen(baseUrl + 'prototype/play'); - this.thenOpen(baseUrl + 'prototype/play'); - this.thenOpen(baseUrl + 'prototype/play'); + this.thenOpen(baseUrl + 'prototype/tutorial'); + this.thenOpen(baseUrl + 'prototype/play'); + this.thenOpen(baseUrl + 'prototype/play'); + this.thenOpen(baseUrl + 'prototype/play'); - this.thenOpen(baseUrl + 'logout'); + this.thenOpen(baseUrl + 'logout'); - }); + }); +} - })(i); +for (var i = 0; i < limit; i++) { + + addLevel(i); } diff --git a/utils/load/load.sh b/utils/load/load.sh index 82be3ef..0f52537 100755 --- a/utils/load/load.sh +++ b/utils/load/load.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash -rm cookies* +rm -f cookies* for i in `seq 1 8`; do casperjs load.js --cookies-file=cookies"$i".txt& done