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

Merge branch 'feature/ctrl-enter-submit' of github.com:FreeCodeCamp/freecodecamp into feature/ctrl-enter-submit

Browse Source 
Conflicts:
	client/commonFramework.js
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showJS.jade
This commit is contained in:
Quincy Larson
2015-09-09 20:40:40 -07:00
parent 09b6dae11b d3e77f1282
commit 0d31256a10
9 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/commonFramework.js
View File

@@ -420,6 +420,13 @@ var testSuccess = function() {
isInitRun = false;
};
function ctrlEnterClickHandler(e) {
// ctrl + enter
if (e.ctrlKey && e.keyCode === 13) {
$('#submit-challenge').click();
}
}
function showCompletion() {
if (isInitRun) {
isInitRun = false;
@@ -435,6 +442,8 @@ function showCompletion() {
);
var bonfireSolution = myCodeMirror.getValue();
var didCompleteWith = $('#completed-with').val() || null;
$('#complete-courseware-dialog').modal('show');
$('#complete-courseware-dialog .modal-header').click();
@@ -774,6 +783,17 @@ $('#submitButton').on('click', function() {
});
$(document).ready(function() {
// init modal keybindings on open
$('#complete-courseware-dialog').on('shown.bs.modal', function() {
$('#complete-courseware-dialog').keyup(ctrlEnterClickHandler);
});
// remove modal keybinds on close
$('#complete-courseware-dialog').on('hidden.bs.modal', function() {
$('#complete-courseware-dialog').unbind('keyup', ctrlEnterClickHandler);
});
var $preview = $('#preview');
isInitRun = true;