From 7fd5174fe0bd97539a9166f527b1256dee6b7530 Mon Sep 17 00:00:00 2001 From: Logan Tegman Date: Thu, 29 Oct 2015 00:13:20 -0700 Subject: [PATCH] Fix Ctrl-Enter doesn't work when not logged in. Closes #3900 First time contributing real code, so please let me know any critiques or style changes I should make. --- client/commonFramework.js | 6 +++++- server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/commonFramework.js b/client/commonFramework.js index 2505fe08f4..559592bfbe 100644 --- a/client/commonFramework.js +++ b/client/commonFramework.js @@ -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; + } } } diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 92432a3bf4..5a2f6c0a11 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -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 diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index ad2213e803..d07dd7748d 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -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) { diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 887e44c964..4cfe47bf96 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -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)};