frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ben Hardill
2014-02-18 10:25:21 +00:00
parent 7af88f63f5 b8953abb28
commit 560d106ba2
19 changed files with 310 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/core/20-inject.js
View File

@@ -83,7 +83,7 @@ InjectNode.prototype.close = function() {
}
}
RED.app.post("/inject/:id", function(req,res) {
RED.httpAdmin.post("/inject/:id", function(req,res) {
var node = RED.nodes.getNode(req.params.id);
if (node != null) {
try {

4
nodes/core/core/58-debug.js
View File

@@ -80,7 +80,7 @@ DebugNode.send = function(msg) {
DebugNode.activeConnections = [];
var path = RED.settings.httpRoot || "/";
var path = RED.settings.httpAdminRoot || "/";
path = path + (path.slice(-1) == "/" ? "":"/") + "debug/ws";
DebugNode.wsServer = new ws.Server({server:RED.server,path:path});
@@ -104,7 +104,7 @@ DebugNode.logHandler.on("log",function(msg) {
});
RED.nodes.addLogHandler(DebugNode.logHandler);
RED.app.post("/debug/:id/:state", function(req,res) {
RED.httpAdmin.post("/debug/:id/:state", function(req,res) {
var node = RED.nodes.getNode(req.params.id);
var state = req.params.state;
if (node != null) {