From f11b906fd9c5044f93f84752a759a6bde607303e Mon Sep 17 00:00:00 2001 From: dceejay Date: Sun, 10 May 2015 10:00:44 +0100 Subject: [PATCH] Websocket - fix broken test (or rather - fix code to pass test) --- nodes/core/io/22-websocket.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nodes/core/io/22-websocket.js b/nodes/core/io/22-websocket.js index fe347dedd..02410587a 100644 --- a/nodes/core/io/22-websocket.js +++ b/nodes/core/io/22-websocket.js @@ -180,12 +180,12 @@ module.exports = function(RED) { this.serverConfig = RED.nodes.getNode(this.server); if (this.serverConfig) { this.serverConfig.registerInputNode(this); + this.serverConfig.on('opened', function(n) { node.status({fill:"green",shape:"dot",text:"connected "+n}); }); + this.serverConfig.on('erro', function() { node.status({fill:"red",shape:"ring",text:"error"}); }); + this.serverConfig.on('closed', function() { node.status({fill:"red",shape:"ring",text:"disconnected"}); }); } else { this.error("Missing server configuration"); } - this.serverConfig.on('opened', function(n) { node.status({fill:"green",shape:"dot",text:"connected "+n}); }); - this.serverConfig.on('erro', function() { node.status({fill:"red",shape:"ring",text:"error"}); }); - this.serverConfig.on('closed', function() { node.status({fill:"red",shape:"ring",text:"disconnected"}); }); } RED.nodes.registerType("websocket in",WebSocketInNode); @@ -197,9 +197,11 @@ module.exports = function(RED) { if (!this.serverConfig) { this.error("Missing server configuration"); } - this.serverConfig.on('opened', function(n) { node.status({fill:"green",shape:"dot",text:"connected "+n}); }); - this.serverConfig.on('erro', function() { node.status({fill:"red",shape:"ring",text:"error"}); }); - this.serverConfig.on('closed', function() { node.status({fill:"red",shape:"ring",text:"disconnected"}); }); + else { + this.serverConfig.on('opened', function(n) { node.status({fill:"green",shape:"dot",text:"connected "+n}); }); + this.serverConfig.on('erro', function() { node.status({fill:"red",shape:"ring",text:"error"}); }); + this.serverConfig.on('closed', function() { node.status({fill:"red",shape:"ring",text:"disconnected"}); }); + } this.on("input", function(msg) { var payload; if (this.serverConfig.wholemsg) {