From 04db6744b9e7dca98947197a3d177ea6e47de667 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 24 Nov 2015 15:01:22 -0800
Subject: [PATCH] Fix code output logic Fix codemirror url paths

---
 client/commonFramework/output-display.js |  2 +-
 server/views/coursewares/showJS.jade     | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/commonFramework/output-display.js b/client/commonFramework/output-display.js
index 7850435317..25d9b28acd 100644
--- a/client/commonFramework/output-display.js
+++ b/client/commonFramework/output-display.js
@@ -9,7 +9,7 @@ window.common = (function(global) {
 
   if (
     !CodeMirror ||
-    challengeType !== challengeTypes.JS ||
+    challengeType !== challengeTypes.JS &&
     challengeType !== challengeTypes.BONFIRE
   ) {
     common.updateOutputDisplay = () => {};
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index ec0bf9cbf0..f630881d16 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -1,8 +1,8 @@
 extends ../layout-wide
 block content
-    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/theme/monokai.css')
+    link(rel='stylesheet', href='/bower_components/CodeMirror/lib/codemirror.css')
+    link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
+    link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
     link(rel='stylesheet', href='/css/ubuntu.css')
     .row(ng-controller="pairedWithController")
         .col-md-4.col-lg-3
@@ -100,4 +100,7 @@ block content
           window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
         }
       });
-      editor.setOption("mode", "javascript");
+
+      common.init.push(function() {
+        common.editor.setOption('mode', 'javascript');
+      });