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

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-09-04 14:27:08 -07:00
parent 79a396b9c8 f7d7990c4f
commit 2123796220
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/commonFramework.js
View File

@ -421,7 +421,7 @@ function showCompletion() {
); );
var bonfireSolution = myCodeMirror.getValue(); var bonfireSolution = myCodeMirror.getValue();
var didCompleteWith = $('#completed-with').val() || null; var didCompleteWith = $('#completed-with').val() || null;
$('#complete-courseware-dialog').modal('show'); $('#complete-courseware-dialog').modal('show').focus();
$('#submit-challenge').click(function(e) { $('#submit-challenge').click(function(e) {
e.preventDefault(); e.preventDefault();
@ -639,6 +639,9 @@ var runTests = function(err, data) {
allTestsPassed = false; allTestsPassed = false;
showCompletion(); showCompletion();
} }
else{
isInitRun = false;
}
} }
}; };
@ -755,7 +758,6 @@ $(document).ready(function() {
allSeeds; allSeeds;
myCodeMirror.setValue(replaceSafeTags(editorValue)); myCodeMirror.setValue(replaceSafeTags(editorValue));
if (typeof $preview.html() !== 'undefined') { if (typeof $preview.html() !== 'undefined') {
$preview.load(function() { $preview.load(function() {
if (initPreview) { if (initPreview) {

2
common/app/routes/Bonfires/README.md
View File

@ -1 +1 @@
This folder contains things relative to the bonfires screens This folder contains things relative to the bonfires' screens

2
seed/challenges/html5-and-css.json
View File

@ -3053,7 +3053,7 @@
"Let's try this again, but with <code>margin</code> this time.", "Let's try this again, but with <code>margin</code> this time.",
"Instead of specifying an element's <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> properties, you can specify them all in one line, like this: <code>margin: 10px 20px 10px 20px;</code>.", "Instead of specifying an element's <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> properties, you can specify them all in one line, like this: <code>margin: 10px 20px 10px 20px;</code>.",
"These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions.", "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions.",
"Use <code>Clockwise Notation</code> to give an element a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side." "Use <code>Clockwise Notation</code> to give the element with the <code>green-box</code> class a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
], ],
"tests": [ "tests": [
"assert($(\".green-box\").css(\"margin-top\") === \"40px\", 'Your <code>green-box</code> class should give the top of elements <code>40px</code> of <code>margin</code>.')", "assert($(\".green-box\").css(\"margin-top\") === \"40px\", 'Your <code>green-box</code> class should give the top of elements <code>40px</code> of <code>margin</code>.')",