From e4f105c7a1eddefc2039e55897d88f05dbdc33fa Mon Sep 17 00:00:00 2001
From: Nicholas O'Leary <nick.oleary@gmail.com>
Date: Thu, 26 Sep 2013 21:13:09 +0100
Subject: [PATCH] Make the runtime embeddedable

---
 red.js       | 4 ++--
 red/nodes.js | 5 ++---
 red/red.js   | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/red.js b/red.js
index ae7d46d0f..6e6f8abfd 100644
--- a/red.js
+++ b/red.js
@@ -49,8 +49,8 @@ if (settings.httpAuth) {
     );
 }
 
-RED.init(server,settings);
-app.use(settings.httpRoot,RED.app);
+var red = RED.init(server,settings);
+app.use(settings.httpRoot,red);
 
     
 server.listen(settings.uiPort);
diff --git a/red/nodes.js b/red/nodes.js
index b60c647a8..0cfebe9a0 100644
--- a/red/nodes.js
+++ b/red/nodes.js
@@ -242,7 +242,7 @@ module.exports.load = function() {
                 if (stats.isFile()) {
                     if (/\.js$/.test(fn)) {
                         try {
-                            require("../"+dir+"/"+fn);
+                            require(dir+"/"+fn);
                         } catch(err) {
                             util.log("["+fn+"] "+err);
                             //console.log(err.stack);
@@ -256,8 +256,7 @@ module.exports.load = function() {
                 }
         });
     }
-
-    loadNodes("nodes");
+    loadNodes(__dirname+"/../nodes");
 
     //events.emit("nodes-loaded");
 }
diff --git a/red/red.js b/red/red.js
index 4037f70ec..23134df57 100644
--- a/red/red.js
+++ b/red/red.js
@@ -29,6 +29,7 @@ var RED = {
         settings = userSettings;
         server.init(httpServer,settings);
         library.init();
+        return server.app;
     },
     
     start: server.start,