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

Fix linting in JavaScript editor

Browse Source
This commit is contained in:
Berkeley Martinez
2015-10-23 15:38:51 -07:00
parent 844f978fb0
commit 756efcd9fb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/commonFramework.js
View File

@ -374,8 +374,9 @@ var editor = (function(CodeMirror, emmetCodeMirror, common) {
} }
var editor = CodeMirror.fromTextArea(document.getElementById('codeEditor'), { var editor = CodeMirror.fromTextArea(document.getElementById('codeEditor'), {
lint: true,
lineNumbers: true, lineNumbers: true,
mode: 'text', mode: 'javascript',
theme: 'monokai', theme: 'monokai',
runnable: true, runnable: true,
matchBrackets: true, matchBrackets: true,

4
server/views/coursewares/showBonfire.jade
View File

@ -1,12 +1,12 @@
extends ../layout-wide extends ../layout-wide
block content block content
script(type='text/javascript', src='/bower_components/jshint/dist/jshint.js')
script(type='text/javascript', src='/js/lib/codemirror/lib/codemirror.js') script(type='text/javascript', src='/js/lib/codemirror/lib/codemirror.js')
script(type='text/javascript', src='/js/lib/codemirror/addon/edit/closebrackets.js') script(type='text/javascript', src='/js/lib/codemirror/addon/edit/closebrackets.js')
script(type='text/javascript', src='/js/lib/codemirror/addon/edit/matchbrackets.js') script(type='text/javascript', src='/js/lib/codemirror/addon/edit/matchbrackets.js')
script(type='text/javascript', src='/js/lib/codemirror/addon/lint/lint.js') script(type='text/javascript', src='/js/lib/codemirror/addon/lint/lint.js')
script(type='text/javascript', src='/js/lib/codemirror/addon/lint/javascript-lint.js') script(type='text/javascript', src='/js/lib/codemirror/addon/lint/javascript-lint.js')
script(type='text/javascript', src='/bower_components/jshint/dist/jshint.js')
script(type='text/javascript', src='/js/lib/chai/chai.js') script(type='text/javascript', src='/js/lib/chai/chai.js')
link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css')
link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css') link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css')
@ -88,8 +88,6 @@ block content
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeEditor(autofocus=true, style='display: none;') textarea#codeEditor(autofocus=true, style='display: none;')
script(src=rev('/js', 'commonFramework.js')) script(src=rev('/js', 'commonFramework.js'))
script.
editor.setOption("mode", "javascript");
#complete-courseware-dialog.modal(tabindex='-1') #complete-courseware-dialog.modal(tabindex='-1')
.modal-dialog.animated.fadeIn.fast-animation .modal-dialog.animated.fadeIn.fast-animation

1
server/views/coursewares/showHTML.jade
View File

@ -76,6 +76,7 @@ block content
textarea#codeEditor(autofocus=true, style='display: none;') textarea#codeEditor(autofocus=true, style='display: none;')
script(src=rev('/js', 'commonFramework.js')) script(src=rev('/js', 'commonFramework.js'))
script. script.
editor.setOption('lint', false);
editor.setOption("mode", "text/html"); editor.setOption("mode", "text/html");
.col-md-4.col-lg-3 .col-md-4.col-lg-3
.hidden-xs.hidden-sm .hidden-xs.hidden-sm