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

Merge branch 'master' into courseware

Browse Source 
Conflicts:
	controllers/bonfire.js
	views/layout.jade
This commit is contained in:
Michael Q Larson
2015-02-02 23:32:46 -08:00
parent 6464241b2e dda901872e
commit f1000c3189
27 changed files with 360 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/main.js
View File

@@ -1,4 +1,7 @@
$(document).ready(function() {
if (bonfireName !== undefined) {
ga('send', 'event', 'Bonfire', 'load', bonfireName + ':' + Math.floor(Date.now() / 1000));
}
var CSRF_HEADER = 'X-CSRF-Token';
@@ -61,7 +64,6 @@ $(document).ready(function() {
var bonfireSolution = myCodeMirror.getValue();
var thisBonfireHash = passedBonfireHash || null;
var didCompleteWith = $('#completed-with').val() || null;
completedBonfire(didCompleteWith, bonfireSolution, thisBonfireHash);
});
@@ -83,6 +85,7 @@ $(document).ready(function() {
// Bonfire instructions functions
$('#more-info').on('click', function() {
ga('send', 'event', 'Bonfire', 'more-info', bonfireName);
$('#brief-instructions').hide();
$('#long-instructions').show().removeClass('hide');