gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve merge conflict, using ziplines changes

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-28 12:16:42 +09:00
parent 947b034533 f7f7fb39b9
commit eb96d2cb02
18 changed files with 229 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/lib/coursewares/coursewaresJSFramework.js
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) {