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

Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
terakilobyte
2015-11-01 17:28:28 -08:00
parent af30d4d56e 254e0cdbf3
commit 16f97913be
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/commonFramework.js
View File

@ -659,7 +659,11 @@ function ctrlEnterClickHandler(e) {
// ctrl + enter
if (e.ctrlKey && e.keyCode === 13) {
$('#complete-courseware-dialog').off('keydown', ctrlEnterClickHandler);
$('#submit-challenge').click();
if ($('#submit-challenge').length > 0) {
$('#submit-challenge').click();
} else {
window.location = '/challenges/next-challenge?id=' + common.challengeId;
}
}
}

2
server/views/coursewares/showBonfire.jade
View File

@ -108,7 +108,7 @@ block content
i.fa.fa-twitter  
= phrase
else
a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
#next-challenge.btn.btn-lg.btn-primary.btn-block Go to my next challenge (ctrl + enter)
#reset-modal.modal(tabindex='-1')
.modal-dialog.animated.fadeInUp.fast-animation
.modal-content

2
server/views/coursewares/showHTML.jade
View File

@ -98,7 +98,7 @@ block content
if(user)
#submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
else
a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
#next-challenge.btn.btn-lg.btn-primary.btn-block Go to my next challenge (ctrl + enter)
include ../partials/challenge-modals
script.
document.addEventListener('gitter-sidecar-ready', function(e) {

2
server/views/coursewares/showJS.jade
View File

@ -95,7 +95,7 @@ block content
if (user)
#submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
else
a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
#next-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Go to my next challenge (ctrl + enter)
include ../partials/challenge-modals
script.
var MDNlinks = !{JSON.stringify(MDNlinks)};