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

Merge branch 'staging' into feature/ctrl-enter-submit

Browse Source 
Conflicts:
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showHTML.jade
This commit is contained in:
Quincy Larson
2015-09-09 18:32:31 -07:00
parent c10f81408a 308071b33c
commit 09b6dae11b
15 changed files with 188 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/commonFramework.js
View File

@@ -216,6 +216,16 @@ var allSeeds = '';
});
})();
if (typeof emmetCodeMirror !== 'undefined') {
var defaultKeymap = {
'Cmd-E': 'emmet.expand_abbreviation',
'Tab': 'emmet.expand_abbreviation_with_tab',
'Enter': 'emmet.insert_formatted_line_break_only'
};
emmetCodeMirror(editor, defaultKeymap);
}
editor.setOption('extraKeys', {
Tab: function(cm) {
if (cm.somethingSelected()) {
@@ -401,9 +411,13 @@ var postError = function(data) {
var goodTests = 0;
var testSuccess = function() {
goodTests++;
// test successful run show completion
if (goodTests === tests.length) {
showCompletion();
return showCompletion();
}
// test unsuccessful, make sure initRun is set to false
isInitRun = false;
};
function showCompletion() {
@@ -465,7 +479,7 @@ function showCompletion() {
},
function(res) {
if (res) {
window.location = '/challenges/next-challenge';
window.location = '/challenges/next-challenge?id=' + challenge_Id;
}
}
);
@@ -632,7 +646,9 @@ var runTests = function(err, data) {
) {
try {
if (chaiTestFromJSON) {
/* eslint-disable no-eval */
var output = eval(reassembleTest(chaiTestFromJSON, data));
/* eslint-enable no-eval */
}
} catch (error) {
allTestsPassed = false;
@@ -647,8 +663,7 @@ var runTests = function(err, data) {
if (allTestsPassed) {
allTestsPassed = false;
showCompletion();
}
else{
} else {
isInitRun = false;
}
}

8
client/main.js
View File

@@ -141,7 +141,7 @@ $(document).ready(function() {
}).success(
function(res) {
if (res) {
window.location.href = '/challenges/next-challenge';
window.location.href = '/challenges/next-challenge?id=' + challenge_Id;
}
}).fail(
function() {
@@ -164,7 +164,7 @@ $(document).ready(function() {
}
}).success(
function() {
window.location.href = '/challenges/next-challenge';
window.location.href = '/challenges/next-challenge?id=' + challenge_Id;
}).fail(
function() {
window.location.href = '/challenges';
@@ -187,13 +187,13 @@ $(document).ready(function() {
verified: false
}
}).success(function() {
window.location.href = '/challenges/next-challenge';
window.location.href = '/challenges/next-challenge?id=' + challenge_Id;
}).fail(function() {
window.location.replace(window.location.href);
});
break;
case challengeTypes.BONFIRE:
window.location.href = '/challenges/next-challenge';
window.location.href = '/challenges/next-challenge?id=' + challenge_Id;
default:
break;
}