diff --git a/client/commonFramework.js b/client/commonFramework.js index a28a1e743d..c100edd30d 100644 --- a/client/commonFramework.js +++ b/client/commonFramework.js @@ -374,8 +374,9 @@ var editor = (function(CodeMirror, emmetCodeMirror, common) { } var editor = CodeMirror.fromTextArea(document.getElementById('codeEditor'), { + lint: true, lineNumbers: true, - mode: 'text', + mode: 'javascript', theme: 'monokai', runnable: true, matchBrackets: true, diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 84bfdb0e29..92432a3bf4 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -1,12 +1,12 @@ extends ../layout-wide 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/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/lint/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') link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css') @@ -88,8 +88,6 @@ block content .form-group.codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') script(src=rev('/js', 'commonFramework.js')) - script. - editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') .modal-dialog.animated.fadeIn.fast-animation diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index e83aa938a8..ad2213e803 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -76,6 +76,7 @@ block content textarea#codeEditor(autofocus=true, style='display: none;') script(src=rev('/js', 'commonFramework.js')) script. + editor.setOption('lint', false); editor.setOption("mode", "text/html"); .col-md-4.col-lg-3 .hidden-xs.hidden-sm