preparing for integration of testing

public/css/main.less

@@ -536,8 +536,9 @@ form.code span {
   padding-bottom: 0px;
 }
 
-.panel-bonfire {
-  min-height: 590px;
+div.CodeMirror-scroll {
+  padding-bottom: 100px;
+
 }
 
 //uncomment this to see the dimensions of all elements outlined in red

public/js/lib/bonfire/bonfire.js

@@ -16,7 +16,12 @@ var submit = function(code) {
 
 // puts the message on the terminal
 var print = function(cls, msg) {
+    if (cls) {
         codeOutput.setValue(msg);
+    } else {
+        codeOutput.setValue(msg.output);
+        console.log(msg.type);
+    }
 };
 
 
@@ -43,7 +48,7 @@ var api = {
       if (data.error) {
           print('message', data.error);
       } else {
-          print('output', data.output);
+          print(null, data);
       }
     }
 };

public/js/lib/bonfire/framework.js

@@ -8,6 +8,7 @@ var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor")
     matchBrackets: true,
     autoCloseBrackets: true,
     cursorHeight: 0.85,
+    scrollbarStyle: 'null',
     lineWrapping: true,
     gutters: ["CodeMirror-lint-markers"],
     onKeyEvent: doLinting,
@@ -25,9 +26,9 @@ myCodeMirror.setValue('/*Welcome to Bonfire, Free Code Camp\'s future CoderByte
 '  return [1,2,3].map(function(elem) {\n' +
 '    return elem * elem;\n' +
 '  });\n' +
-'}\n\n' +
+'}\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n' +
 'test();');
-myCodeMirror.setSize("100%", "100%");
+//myCodeMirror.setSize("100%", "100%");
 
 var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
     lineNumbers: false,

public/js/lib/bonfire/plugin_v0.1.1.js

@@ -4,11 +4,14 @@ var run = function(code) {
     var result = {
         input: code,
         output: null,
-        error: null
+        error: null,
+        type: null
     };
 
     try {
-        result.output = stringify(runHidden(code));
+        var codeExec = runHidden(code);
+        result.type = typeof codeExec;
+        result.output = stringify(codeExec);
     } catch(e) {
         result.error = e.message;
     }