From c39e2672fca04e0b6d52fc56155ea98b4f245260 Mon Sep 17 00:00:00 2001
From: webdev <terakilobyte@gmail.com>
Date: Fri, 16 Jan 2015 21:55:01 -0500
Subject: [PATCH] Basic bonfire functionality completed

---
 public/js/lib/bonfire/bonfire.js | 18 ++++++++++--------
 views/bonfire/bonfire.jade       |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/js/lib/bonfire/bonfire.js b/public/js/lib/bonfire/bonfire.js
index e4cb64f853..52f2e1b9dd 100644
--- a/public/js/lib/bonfire/bonfire.js
+++ b/public/js/lib/bonfire/bonfire.js
@@ -27,7 +27,7 @@ var escape = function(msg) {
 
 // puts the message on the terminal
 var print = function(cls, msg) {
-    codeOutput.setValue(escape(msg));
+    codeOutput.setValue(msg);
 };
 
 
@@ -53,7 +53,7 @@ var api = {
             endLoading();
         }
 
-        print('separator');
+       // print('separator');
         print('input', data.input);
         if (data.error) {
             print('message', data.error);
@@ -84,18 +84,20 @@ var reset = function() {
         // give some time to handle the last responce
         setTimeout( function() {
             endLoading();
-
-            while (el.terminal.hasChildNodes()) {
-                el.terminal.removeChild(el.terminal.childNodes[0]);
-            }
+            codeOutput.setValue('Infinite loop detected!');
 
 
-            print('message', 'Your code took too long to execute. Check for an infinite loop or recursion.');
+            
+
+
+           // print('message', 'Your code took too long to execute. Check for an infinite loop or recursion.');
+//            console.log('infinite loop');
+  //          $('#codeOutput.setValue('Infinite loop detected')')
 
             reset();
         }, 10);
     });
-}
+};
 
 
 // initialize everything
diff --git a/views/bonfire/bonfire.jade b/views/bonfire/bonfire.jade
index 1ff3a8b5dd..86abfe8d02 100644
--- a/views/bonfire/bonfire.jade
+++ b/views/bonfire/bonfire.jade
@@ -2,6 +2,7 @@ extends ../layout
 block content
     script(src='/js/lib/codemirror/lib/codemirror.js')
     script(src='/js/lib/codemirror/addon/edit/closebrackets.js')
+    script(src='/js/lib/codemirror/addon/edit/matchbrackets.js')
     script(src='/js/lib/codemirror/addon/lint/lint.js')
     script(src='/js/lib/codemirror/addon/lint/javascript-lint.js')
     script(src='//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js')
@@ -34,6 +35,8 @@ block content
                             mode: "javascript",
                             theme: 'monokai',
                             runnable: true,
+                            lint: true,
+                            matchBrackets: true,
                             autoCloseBrackets: true,
                             gutters: ["CodeMirror-lint-markers"],
                             onKeyEvent : doLinting
@@ -81,7 +84,6 @@ block content
                             $('#codeOutput').empty();
                             var js = myCodeMirror.getValue();
                            submit(js);
-                           console.log('submitted');
                         });