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

Cleaning up framework

Browse Source
This commit is contained in:
Nathan Leniz
2015-01-22 00:38:39 -05:00
parent 74291d2299
commit 4026ae1c75
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/js/lib/bonfire/bonfireFramework.js
View File

@ -7,7 +7,7 @@ var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor")
lint: true, lint: true,
matchBrackets: true, matchBrackets: true,
autoCloseBrackets: true, autoCloseBrackets: true,
cursorHeight: 0.85, cursorHeight: 1,
scrollbarStyle: 'null', scrollbarStyle: 'null',
lineWrapping: true, lineWrapping: true,
gutters: ["CodeMirror-lint-markers"], gutters: ["CodeMirror-lint-markers"],
@ -22,7 +22,8 @@ var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor")
var editor = myCodeMirror; var editor = myCodeMirror;
myCodeMirror.setValue('/*Welcome to Bonfire, Free Code Camp\'s future CoderByte replacement.\n' + myCodeMirror.setValue('/*Welcome to Bonfire, Free Code Camp\'s future CoderByte replacement.\n' +
'Please feel free to use Bonfire as an in-browser playground and linting tool.\n' + 'Please feel free to use Bonfire as an in-browser playground and linting tool.\n' +
'Note that you can also write tests using Chai.js by using the keywords assert and expect */\n\n' + 'Note that you can also write tests using Chai.js\n' +
' by using the keywords assert and expect */\n\n' +
'function test() {\n' + 'function test() {\n' +
' assert(2 !== 3, "2 is not equal to 3");\n' + ' assert(2 !== 3, "2 is not equal to 3");\n' +
' return [1,2,3].map(function(elem) {\n' + ' return [1,2,3].map(function(elem) {\n' +
@ -32,7 +33,6 @@ myCodeMirror.setValue('/*Welcome to Bonfire, Free Code Camp\'s future CoderByte
'expect(test()).to.be.a("array");\n\n' + 'expect(test()).to.be.a("array");\n\n' +
'assert.deepEqual(test(), [1,4,9]);\n\n' + 'assert.deepEqual(test(), [1,4,9]);\n\n' +
'test();'); 'test();');
//myCodeMirror.setSize("100%", "100%");
var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
lineNumbers: false, lineNumbers: false,
@ -50,7 +50,7 @@ var info = editor.getScrollInfo();
var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top; var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
if (info.top + info.clientHeight < after) if (info.top + info.clientHeight < after)
editor.scrollTo(null, after - info.clientHeight + 3); editor.scrollTo(null, after - info.clientHeight + 3);
var doLinting = function () { function doLinting () {
editor.operation(function () { editor.operation(function () {
for (var i = 0; i < widgets.length; ++i) for (var i = 0; i < widgets.length; ++i)
editor.removeLineWidget(widgets[i]); editor.removeLineWidget(widgets[i]);
@ -179,12 +179,9 @@ var runTests = function(err, data) {
var output = eval(reassembleTest(test, data)); var output = eval(reassembleTest(test, data));
} }
} catch(error) { } catch(error) {
console.log(error);
arr[ix].err = error.name + ":" + error.message; arr[ix].err = error.name + ":" + error.message;
console.log(arr);
} finally { } finally {
if (!test) { if (!test) {
//window.setTimeout(function() {createTestDisplay()},2000);
createTestDisplay(); createTestDisplay();
} }
} }