greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

pull/467/head
Quincy Larson 2015-05-10 23:26:10 -07:00
parent 2a449b2eb1 5a0915d5fc
commit 066f0d3eab
10 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -24,6 +24,7 @@
"bootstrap": "~3.3.4", "bootstrap": "~3.3.4",
"font-awesome": "~4.3.0", "font-awesome": "~4.3.0",
"moment": "~2.10.2", "moment": "~2.10.2",
"angular-bootstrap": "~0.13.0" "angular-bootstrap": "~0.13.0",
"ramda": "~0.13.0"
} }
} }

6
public/css/main.less
View File

@ -729,7 +729,7 @@ div.CodeMirror-scroll {
} }
.test-vertical-center { .test-vertical-center {
margin-top: 15px; margin-top: 8px;
} }
.cm-s-monokai.CodeMirror { .cm-s-monokai.CodeMirror {
@ -1073,6 +1073,10 @@ hr {
border-radius: 5px; border-radius: 5px;
} }
.grayed-out-test-output {
color: @gray-light;
}
//uncomment this to see the dimensions of all elements outlined in red //uncomment this to see the dimensions of all elements outlined in red
//* { //* {
// border-color: red; // border-color: red;

9
public/js/lib/bonfire/bonfireFramework_v0.1.2.js → public/js/lib/bonfire/bonfireFramework_v0.1.3.js
View File

@ -197,11 +197,11 @@ var createTestDisplay = function() {
var testDoc = document.createElement("div"); var testDoc = document.createElement("div");
if (test.err != null) { if (test.err != null) {
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-11 test-output wrappable'>" + test.text + "</div><div class='col-xs-11 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>") .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-11 test-output wrappable grayed-out-test-output'>" + test.text + "</div><div class='col-xs-11 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
.prependTo($('#testSuite')) .prependTo($('#testSuite'))
} else { } else {
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-11 test-output test-vertical-center wrappable'>" + test.text + "</div></div><div class='ten-pixel-break'/>") .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-11 test-output test-vertical-center wrappable '>" + test.text + "</div></div><div class='ten-pixel-break'/>")
.appendTo($('#testSuite')); .appendTo($('#testSuite'));
} }
}; };
@ -209,6 +209,7 @@ var createTestDisplay = function() {
var assert = chai.assert; var assert = chai.assert;
var expect = chai.expect; var expect = chai.expect;
var should = chai.should(); var should = chai.should();
chai.config.showDiff = true;
var reassembleTest = function(test, data) { var reassembleTest = function(test, data) {
var lineNum = test.line; var lineNum = test.line;
@ -233,7 +234,7 @@ var runTests = function(err, data) {
} }
} catch(error) { } catch(error) {
allTestsPassed = false; allTestsPassed = false;
arr[ix].err = error.name + ":" + error.message; arr[ix].err = error.message;
} finally { } finally {
if (!test) { if (!test) {
createTestDisplay(); createTestDisplay();
@ -258,4 +259,4 @@ function showCompletion() {
$('.next-bonfire-button').click(); $('.next-bonfire-button').click();
} }
}); });
} }

4
public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js → public/js/lib/coursewares/coursewaresHCJQFramework_0.1.1.js
View File

@ -56,7 +56,7 @@ var allTests = '';
}); });
})(); })();
var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts.js'></script>"; var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts_0.0.1.js'></script>";
var delay; var delay;
// Initialize CodeMirror editor with a nice html5 canvas demo. // Initialize CodeMirror editor with a nice html5 canvas demo.
@ -92,7 +92,7 @@ var postSuccess = function(data) {
var postError = function(data) { var postError = function(data) {
var testDoc = document.createElement("div"); var testDoc = document.createElement("div");
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>") .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
.prependTo($('#testSuite')) .prependTo($('#testSuite'))
}; };
var goodTests = 0; var goodTests = 0;

8
public/js/lib/coursewares/coursewaresJSFramework.js → public/js/lib/coursewares/coursewaresJSFramework_0.0.1.js
View File

@ -182,11 +182,11 @@ var createTestDisplay = function() {
if (test.err != null) { if (test.err != null) {
console.log('Should be displaying bad tests'); console.log('Should be displaying bad tests');
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>") .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
.prependTo($('#testSuite')) .prependTo($('#testSuite'))
} else { } else {
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + test.text + "</div></div><div class='ten-pixel-break'/>") .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
.appendTo($('#testSuite')); .appendTo($('#testSuite'));
} }
}; };
@ -218,7 +218,7 @@ var runTests = function(err, data) {
} }
} catch(error) { } catch(error) {
allTestsPassed = false; allTestsPassed = false;
arr[ix].err = error.name + ":" + error.message; arr[ix].err = error.message;
} finally { } finally {
if (!test) { if (!test) {
createTestDisplay(); createTestDisplay();
@ -243,4 +243,4 @@ function showCompletion() {
$('#next-courseware-button').click(); $('#next-courseware-button').click();
} }
}); });
} }

6
public/js/lib/coursewares/iFrameScripts.js → public/js/lib/coursewares/iFrameScripts_0.0.1.js
View File

@ -9,11 +9,11 @@
} catch (err) { } catch (err) {
allTestsGood = false; allTestsGood = false;
thisTest = false; thisTest = false;
parent.postError(JSON.stringify(tests[i])); parent.postError(JSON.stringify(err.message.split(':').shift()));
} finally { } finally {
if (thisTest) { if (thisTest) {
parent.postSuccess(JSON.stringify(tests[i])); parent.postSuccess(JSON.stringify(tests[i].split(',').pop().replace(/\'/g, '').replace(/\)/, '')));
} }
} }
} }
})(); })();

4
views/bonfire/show.jade
View File

@ -15,8 +15,6 @@ block content
script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js') script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js')
script(type='text/javascript', src='/js/lib/jailed/jailed.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js')
script(type='text/javascript', src='/js/lib/bonfire/bonfireInit.js') script(type='text/javascript', src='/js/lib/bonfire/bonfireInit.js')
script(type='text/javascript', src="//cdnjs.cloudflare.com/ajax/libs/ramda/0.13.0/ramda.min.js")
.row .row
.col-xs-12.col-sm-12.col-md-4.bonfire-top .col-xs-12.col-sm-12.col-md-4.bonfire-top
@ -106,7 +104,7 @@ block content
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeEditor(autofocus=true, style='display: none;') textarea#codeEditor(autofocus=true, style='display: none;')
script(src='/js/lib/bonfire/bonfireFramework_v0.1.2.js') script(src='/js/lib/bonfire/bonfireFramework_v0.1.3.js')

2
views/coursewares/showHTML.jade
View File

@ -82,4 +82,4 @@ block content
.animated.zoomInDown.delay-half .animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary span.completion-icon.ion-checkmark-circled.text-primary
a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script(src="/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js") script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.1.js")

2
views/coursewares/showJS.jade
View File

@ -56,7 +56,7 @@ block content
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeEditor(autofocus=true, style='display: none;') textarea#codeEditor(autofocus=true, style='display: none;')
script(src='/js/lib/coursewares/coursewaresJSFramework.js') script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.1.js')
#complete-courseware-dialog.modal(tabindex='-1') #complete-courseware-dialog.modal(tabindex='-1')
.modal-dialog.animated.zoomIn.fast-animation .modal-dialog.animated.zoomIn.fast-animation
.modal-content .modal-content

4
views/partials/universal-head.jade
View File

@ -25,7 +25,7 @@ script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstra
script. script.
if (typeof($.fn.modal) === 'undefined') { if (typeof($.fn.modal) === 'undefined') {
document.write('<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"><\/script>'); document.write('<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"><\/script>');
}; }
script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js")
script. script.
@ -36,6 +36,8 @@ script(src="/js/main.js")
script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js") script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
script(src="/bower_components/ramda/dist/ramda.min.js")
link(rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:400|Inconsolata") link(rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:400|Inconsolata")
link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css") link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css")