From 2c9ed16b7abcac9bde9de0c520f17b41c5a032b7 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 13:09:38 -0700 Subject: [PATCH] fix only submit on user click --- ...Work_0.0.5.js => commonFrameWork_0.0.6.js} | 33 +++++++++---------- server/views/coursewares/showBonfire.jade | 5 ++- server/views/coursewares/showHTML.jade | 4 +-- server/views/coursewares/showJS.jade | 4 +-- 4 files changed, 22 insertions(+), 24 deletions(-) rename public/js/lib/coursewares/{commonFrameWork_0.0.5.js => commonFrameWork_0.0.6.js} (97%) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.5.js b/public/js/lib/coursewares/commonFrameWork_0.0.6.js similarity index 97% rename from public/js/lib/coursewares/commonFrameWork_0.0.5.js rename to public/js/lib/coursewares/commonFrameWork_0.0.6.js index 429effe7a6..7bc8b75d66 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.5.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.6.js @@ -294,27 +294,26 @@ function showCompletion() { ', Attempts: ' + attempts); var bonfireSolution = myCodeMirror.getValue(); var didCompleteWith = $('#completed-with').val() || null; - $.post( + $('#complete-courseware-dialog').modal('show'); + $('#submit-challenge').click(function(e) { + e.preventDefault(); + $.post( '/completed-bonfire/', { - challengeInfo: { - challengeId: challenge_Id, - challengeName: challenge_Name, - completedWith: didCompleteWith, - challengeType: challengeType, - solution: bonfireSolution - } + challengeInfo: { + challengeId: challenge_Id, + challengeName: challenge_Name, + completedWith: didCompleteWith, + challengeType: challengeType, + solution: bonfireSolution + } }, function(res) { - if (res) { - $('#complete-courseware-dialog').modal('show'); - $('#complete-courseware-dialog').keydown(function(e) { - if (e.ctrlKey && e.keyCode == 13) { - $('#next-courseware-button').click(); - } - }); - } + if (res) { + window.location = '/challenges/next-challenge'; + } } - ); + ); + }); } var resetEditor = function resetEditor() { diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 395eae398d..d6ba73e1f8 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -124,7 +124,7 @@ block content form.code .form-group.codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src='/js/lib/coursewares/commonFrameWork_0.0.5.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.6.js') script. editor.setOption("mode", "javascript"); @@ -138,8 +138,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if (user) - - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge (ctrl + enter) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit if (user.progressTimestamps.length > 2) a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index c008b3616f..ac3c14619c 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -72,7 +72,7 @@ block content form.code .codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src = '/js/lib/coursewares/commonFrameWork_0.0.5.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.6.js') script. editor.setOption("mode", "text/html"); .col-md-4.col-lg-3 @@ -91,7 +91,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if(user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge') Go to the next challenge + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress include ../partials/challenge-modals diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index ae9ad8c83e..f99267f2f0 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -72,7 +72,7 @@ block content form.code .codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src = '/js/lib/coursewares/commonFrameWork_0.0.5.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.6.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') @@ -85,7 +85,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if (user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge (ctrl + enter) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit if (user.progressTimestamps.length > 2) a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") i.fa.fa-twitter