From 6c48e1170e0090f31f08fdb85cb9da2a47f3572e Mon Sep 17 00:00:00 2001 From: Nathan Leniz Date: Tue, 3 Feb 2015 02:17:36 -0500 Subject: [PATCH] Coursewares framework for codemirror, not working --- .../lib/coursewares/coursewaresFramework.js | 19 ++++++++++++++++-- views/coursewares/show.jade | 20 ++----------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/public/js/lib/coursewares/coursewaresFramework.js b/public/js/lib/coursewares/coursewaresFramework.js index 344d1ac335..d71b4902e9 100644 --- a/public/js/lib/coursewares/coursewaresFramework.js +++ b/public/js/lib/coursewares/coursewaresFramework.js @@ -5,10 +5,10 @@ var widgets = []; var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { lineNumbers: true, - mode: "html-mixed", + mode: "text/html", theme: 'monokai', runnable: true, - lint: true, + //lint: true, matchBrackets: true, autoCloseBrackets: true, scrollbarStyle: 'null', @@ -25,6 +25,21 @@ var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor") var editor = myCodeMirror; editor.setSize("100%", "auto"); +var delay; +// Initialize CodeMirror editor with a nice html5 canvas demo. +editor.on("change", function () { + clearTimeout(delay); + delay = setTimeout(updatePreview, 300); +}); +function updatePreview() { + var previewFrame = document.getElementById('preview'); + var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + preview.open(); + preview.write(editor.getValue()); + preview.close(); +} +setTimeout(updatePreview, 300); + // Default value for editor if one isn't provided in (i.e. a challenge) var nonChallengeValue = '/*Welcome to Bonfire, Free Code Camp\'s future CoderByte replacement.\n' + diff --git a/views/coursewares/show.jade b/views/coursewares/show.jade index 0ab3032f74..c97a675422 100644 --- a/views/coursewares/show.jade +++ b/views/coursewares/show.jade @@ -55,7 +55,7 @@ block content form.code .form-group.codeMirrorView textarea#codeEditor(autofocus=true) - script(src='/js/lib/bonfire/bonfireFramework.js') + script(src='/js/lib/coursewares/coursewaresFramework.js') #complete-bonfire-dialog.modal(tabindex='-1') .col-xs-12.col-sm-12.col-md-4 iframe.iphone#preview @@ -100,21 +100,5 @@ block content //script(src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js") //style(src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css") script. - var delay; - // Initialize CodeMirror editor with a nice html5 canvas demo. - var editor = CodeMirror.fromTextArea(document.getElementById('code'), { - mode: 'text/html' - }); - editor.on("change", function () { - clearTimeout(delay); - delay = setTimeout(updatePreview, 300); - }); - function updatePreview() { - var previewFrame = document.getElementById('preview'); - var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; - preview.open(); - preview.write(editor.getValue()); - preview.close(); - } - setTimeout(updatePreview, 300); + \ No newline at end of file