diff --git a/interface/src/ui/JSConsole.cpp b/interface/src/ui/JSConsole.cpp
index 7700874d9a..2d21d1d7ec 100644
--- a/interface/src/ui/JSConsole.cpp
+++ b/interface/src/ui/JSConsole.cpp
@@ -33,6 +33,8 @@ const QString RESULT_ERROR_STYLE = "color: #d13b22;";
const QString GUTTER_PREVIOUS_COMMAND = "<";
const QString GUTTER_ERROR = "X";
+const QString JSConsole::_consoleFileName { "about:console" };
+
JSConsole::JSConsole(QWidget* parent, ScriptEngine* scriptEngine) :
QWidget(parent),
_ui(new Ui::Console),
@@ -84,8 +86,8 @@ void JSConsole::setScriptEngine(ScriptEngine* scriptEngine) {
}
// if scriptEngine is NULL then create one and keep track of it using _ownScriptEngine
- _ownScriptEngine = scriptEngine == NULL;
- _scriptEngine = _ownScriptEngine ? DependencyManager::get()->loadScript(QString(), false) : scriptEngine;
+ _ownScriptEngine = (scriptEngine == NULL);
+ _scriptEngine = _ownScriptEngine ? DependencyManager::get()->loadScript(_consoleFileName, false) : scriptEngine;
connect(_scriptEngine, &ScriptEngine::printedMessage, this, &JSConsole::handlePrint);
connect(_scriptEngine, &ScriptEngine::errorMessage, this, &JSConsole::handleError);
@@ -107,11 +109,10 @@ void JSConsole::executeCommand(const QString& command) {
QScriptValue JSConsole::executeCommandInWatcher(const QString& command) {
QScriptValue result;
- static const QString filename = "JSConcole";
QMetaObject::invokeMethod(_scriptEngine, "evaluate", Qt::ConnectionType::BlockingQueuedConnection,
Q_RETURN_ARG(QScriptValue, result),
Q_ARG(const QString&, command),
- Q_ARG(const QString&, filename));
+ Q_ARG(const QString&, _consoleFileName));
return result;
}
@@ -134,12 +135,12 @@ void JSConsole::commandFinished() {
resetCurrentCommandHistory();
}
-void JSConsole::handleError(const QString& scriptName, const QString& message) {
+void JSConsole::handleError(const QString& message, const QString& scriptName) {
Q_UNUSED(scriptName);
appendMessage(GUTTER_ERROR, "" + message.toHtmlEscaped() + "");
}
-void JSConsole::handlePrint(const QString& scriptName, const QString& message) {
+void JSConsole::handlePrint(const QString& message, const QString& scriptName) {
Q_UNUSED(scriptName);
appendMessage("", message);
}
diff --git a/interface/src/ui/JSConsole.h b/interface/src/ui/JSConsole.h
index d5f5aff301..938b670e78 100644
--- a/interface/src/ui/JSConsole.h
+++ b/interface/src/ui/JSConsole.h
@@ -47,8 +47,8 @@ protected:
protected slots:
void scrollToBottom();
void resizeTextInput();
- void handlePrint(const QString& scriptName, const QString& message);
- void handleError(const QString& scriptName, const QString& message);
+ void handlePrint(const QString& message, const QString& scriptName);
+ void handleError(const QString& message, const QString& scriptName);
void commandFinished();
private:
@@ -66,6 +66,7 @@ private:
bool _ownScriptEngine;
QString _rootCommand;
ScriptEngine* _scriptEngine;
+ static const QString _consoleFileName;
};