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

Merge pull request #3984 from ltegman/fix/ctrl-enter-works-when-not-logged-in-3900

Browse Source 
Fix Ctrl-Enter doesn't work when not logged in.
This commit is contained in:
Berkeley Martinez
2015-11-01 17:27:55 -08:00
parent 1f61c4be02 7fd5174fe0
commit 254e0cdbf3
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/commonFramework.js
View File

@ -659,7 +659,11 @@ function ctrlEnterClickHandler(e) {
// ctrl + enter // ctrl + enter
if (e.ctrlKey && e.keyCode === 13) { if (e.ctrlKey && e.keyCode === 13) {
$('#complete-courseware-dialog').off('keydown', ctrlEnterClickHandler); $('#complete-courseware-dialog').off('keydown', ctrlEnterClickHandler);
if ($('#submit-challenge').length > 0) {
$('#submit-challenge').click(); $('#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   i.fa.fa-twitter  
= phrase = phrase
else 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') #reset-modal.modal(tabindex='-1')
.modal-dialog.animated.fadeInUp.fast-animation .modal-dialog.animated.fadeInUp.fast-animation
.modal-content .modal-content

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

@ -98,7 +98,7 @@ block content
if(user) if(user)
#submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter) #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
else 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 include ../partials/challenge-modals
script. script.
document.addEventListener('gitter-sidecar-ready', function(e) { document.addEventListener('gitter-sidecar-ready', function(e) {

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

@ -95,7 +95,7 @@ block content
if (user) if (user)
#submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter) #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
else 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 include ../partials/challenge-modals
script. script.
var MDNlinks = !{JSON.stringify(MDNlinks)}; var MDNlinks = !{JSON.stringify(MDNlinks)};