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

Hotfix fix basejump-zipline completion

Browse Source
This commit is contained in:
Berkeley Martinez
2015-11-08 20:04:43 -08:00
parent 390caf45aa
commit 8fe3a075bf
2 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/commonFramework.js
View File

@ -1500,7 +1500,11 @@ $(document).ready(function() {
bonfireExecute(true); bonfireExecute(true);
} }
}); });
} else if (common.challengeType !== '7' && common.challengeType !== '2') { } else if (
common.challengeType !== '7' &&
common.challengeType !== '2' &&
common.challengeType !== '3'
) {
bonfireExecute(true); bonfireExecute(true);
} }

67
server/views/coursewares/showZiplineOrBasejump.jade
View File

@ -37,29 +37,6 @@ block content
var userLoggedIn = false; var userLoggedIn = false;
br br
script(type="text/javascript"). script(type="text/javascript").
var challenge_Id = !{JSON.stringify(challengeId)};
var challenge_Name = !{JSON.stringify(name)};
var started = Math.floor(Date.now());
var dashedName = !{JSON.stringify(dashedName)};
var challengeType = !{JSON.stringify(challengeType)};
var controlEnterHandler = function (e) {
$('body').unbind('keydown');
if (e.metaKey && e.keyCode === 13 ||
e.ctrlKey && e.keyCode === 13) {
$('#complete-zipline-or-basejump-dialog').modal('show');
} else {
$('body').bind('keydown', controlEnterHandler);
}
};
var modalControlEnterHandler = function (e) {
$('#complete-zipline-or-basejump-dialog').unbind('keydown');
if (e.metaKey && e.keyCode === 13 ||
e.ctrlKey && e.keyCode === 13) {
$('#next-courseware-button').click();
} else {
$('#complete-zipline-or-basejump-dialog').on('keydown', modalControlEnterHandler);
}
};
#complete-zipline-or-basejump-dialog.modal(tabindex='-1') #complete-zipline-or-basejump-dialog.modal(tabindex='-1')
.modal-dialog.animated.fadeIn.fast-animation .modal-dialog.animated.fadeIn.fast-animation
@ -92,24 +69,57 @@ block content
a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge
.button-spacer .button-spacer
script. script.
$('#complete-zipline-or-basejump-dialog').on('keydown', modalControlEnterHandler);
else else
a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
script. script.
$('body').on('keydown', controlEnterHandler);
include ../partials/challenge-modals include ../partials/challenge-modals
script. script.
var common = window.common || { init: [] };
common.challengeId = !{JSON.stringify(challengeId)};
common.challengeName = !{JSON.stringify(name)};
common.started = Math.floor(Date.now());
common.dashedName = !{JSON.stringify(dashedName)};
common.challengeType = !{JSON.stringify(challengeType)};
common.controlEnterHandler = function (e) {
$('body').unbind('keydown');
if (e.metaKey && e.keyCode === 13 ||
e.ctrlKey && e.keyCode === 13) {
$('#complete-zipline-or-basejump-dialog').modal('show');
} else {
$('body').bind('keydown', common.controlEnterHandler);
}
};
common.modalControlEnterHandler = function (e) {
$('#complete-zipline-or-basejump-dialog').unbind('keydown');
if (e.metaKey && e.keyCode === 13 ||
e.ctrlKey && e.keyCode === 13) {
$('#next-courseware-button').click();
} else {
$('#complete-zipline-or-basejump-dialog').on('keydown', common.modalControlEnterHandler);
}
};
common.init.push(function() {
$('body').on('keydown', common.controlEnterHandler);
if (!!{ JSON.stringify(user ? true : false)}) {
$('#complete-zipline-or-basejump-dialog').on('keydown', common.modalControlEnterHandler);
}
});
document.addEventListener('gitter-sidecar-ready', function(e) { document.addEventListener('gitter-sidecar-ready', function(e) {
var challengeType = !{JSON.stringify(challengeType)};
var room = 'freecodecamp/help'; var room = 'freecodecamp/help';
var title; var title;
if (challengeType === '4') { if (common.challengeType === '4') {
room = 'freecodecamp/helpBasejumps'; room = 'freecodecamp/helpBasejumps';
title = 'Basejump Help'; title = 'Basejump Help';
} }
if (challengeType === '3') { if (common.challengeType === '3') {
room = 'freecodecamp/helpZiplines'; room = 'freecodecamp/helpZiplines';
title = 'Zipline Help'; title = 'Zipline Help';
} }
@ -118,3 +128,4 @@ block content
window.main.chat.createHelpChat(room, '#challenge-help-btn', title); window.main.chat.createHelpChat(room, '#challenge-help-btn', title);
} }
}); });
include ../partials/challenge-footer