From 0cd60782e79c5c7a9784efc324626c1dfacc1bd1 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 14 May 2015 11:00:30 -0700
Subject: [PATCH] Add error handling to JSConsole

---
 interface/src/ui/JSConsole.cpp | 5 +++++
 interface/src/ui/JSConsole.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/interface/src/ui/JSConsole.cpp b/interface/src/ui/JSConsole.cpp
index 700781df69..74585df855 100644
--- a/interface/src/ui/JSConsole.cpp
+++ b/interface/src/ui/JSConsole.cpp
@@ -59,6 +59,7 @@ JSConsole::JSConsole(QWidget* parent, ScriptEngine* scriptEngine) :
     connect(_scriptEngine, SIGNAL(evaluationFinished(QScriptValue, bool)),
             this, SLOT(handleEvalutationFinished(QScriptValue, bool)));
     connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&)));
+    connect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(handleError(const QString&)));
 
     resizeTextInput();
 }
@@ -96,6 +97,10 @@ void JSConsole::handleEvalutationFinished(QScriptValue result, bool isException)
     appendMessage(gutter, resultStr);
 }
 
+void JSConsole::handleError(const QString& message) {
+    appendMessage(GUTTER_ERROR, "<span style='" + RESULT_ERROR_STYLE + "'>" + message.toHtmlEscaped() + "</span>");
+}
+
 void JSConsole::handlePrint(const QString& message) {
     appendMessage("", message);
 }
diff --git a/interface/src/ui/JSConsole.h b/interface/src/ui/JSConsole.h
index daeba8ea15..98afdf7bf8 100644
--- a/interface/src/ui/JSConsole.h
+++ b/interface/src/ui/JSConsole.h
@@ -49,6 +49,7 @@ protected slots:
     void resizeTextInput();
     void handleEvalutationFinished(QScriptValue result, bool isException);
     void handlePrint(const QString& message);
+    void handleError(const QString& message);
 
 private:
     void appendMessage(const QString& gutter, const QString& message);