Merge branch 'ziplines' into ux-improvements

Conflicts:
	views/coursewares/showJS.jade
This commit is contained in:
Michael Q Larson
2015-03-28 00:24:41 -07:00
17 changed files with 220 additions and 727 deletions

View File

@@ -235,7 +235,7 @@ var runTests = function(err, data) {
};
function showCompletion() {
var time = Math.floor(Date.now() / 1000) - started;
var time = Math.floor(Date.now()) - started;
ga('send', 'event', 'Challenge', 'solved', challengeName + ', Time: ' + time +', Attempts: ' + attempts);
$('#complete-courseware-dialog').modal('show');
$('#complete-courseware-dialog').keydown(function(e) {