diff --git a/app/assets/javascripts/angular/controllers/experiments.js b/app/assets/javascripts/angular/controllers/experiments.js index 45750c28..c9ed2b04 100644 --- a/app/assets/javascripts/angular/controllers/experiments.js +++ b/app/assets/javascripts/angular/controllers/experiments.js @@ -160,10 +160,16 @@ $scope.stepResults.startTime = Date.now(); }; - $scope.startTimer = function() { + $scope.endTimer = function() { $scope.stepResults.endTime = Date.now(); }; + $scope.showInstructions = true; + $scope.start = function() { + $scope.showInstructions = false; + $scope.startTimer(); + }; + $scope.SPECTROGRAM_WIDTH = 1080; var PPS = 45; $scope.flashes = []; diff --git a/app/assets/templates/rapid_scanning_experiment.html b/app/assets/templates/rapid_scanning_experiment.html index 12153df7..a718acda 100644 --- a/app/assets/templates/rapid_scanning_experiment.html +++ b/app/assets/templates/rapid_scanning_experiment.html @@ -10,14 +10,14 @@
-
+
- +
-
+
diff --git a/lib/assets/javascripts/functions.js b/lib/assets/javascripts/functions.js index f7adf4a4..a458dc82 100644 --- a/lib/assets/javascripts/functions.js +++ b/lib/assets/javascripts/functions.js @@ -267,7 +267,7 @@ if (!Array.prototype.filter) }); return parts.length ? parts.join('&') : ''; }; - function encodeUriQuery(val, pctEncodeSpaces) { + this.encodeUriQuery = function encodeUriQuery(val, pctEncodeSpaces) { val = val || ""; return encodeURIComponent(val). replace(/%40/gi, '@'). @@ -275,7 +275,7 @@ if (!Array.prototype.filter) replace(/%24/g, '$'). replace(/%2C/gi, ','). replace((pctEncodeSpaces ? null : /%20/g), '+'); - } + }; this.isUndefined = function isUndefined(value) { return typeof value == 'undefined';