node-red-contrib-deconz
Advanced tools
Comparing version 0.2.2 to 0.2.3
@@ -94,9 +94,10 @@ var request = require('request'); | ||
if (deviceMeta) { | ||
devices[node.id] = deviceMeta.uniqueid; | ||
devices[node.id] = deviceMeta.uniqueid; | ||
node.meta = deviceMeta; | ||
node.status({ | ||
fill: "green", | ||
shape: "dot", | ||
text: (config.state in node.meta.state)?node.meta.state[config.state]:"connected" | ||
text: (config.state in node.meta.state)?(node.meta.state[config.state]?node.meta.state[config.state]:''):"connected", | ||
}); | ||
@@ -268,19 +269,21 @@ | ||
ws.on('message', function(data) { | ||
var dataParsed = JSON.parse(data); | ||
for (var nodeId in devices) { | ||
var item = devices[nodeId]; | ||
if (data) { | ||
var dataParsed = JSON.parse(data); | ||
for (var nodeId in devices) { | ||
var item = devices[nodeId]; | ||
if (dataParsed.uniqueid === item) { | ||
var node = RED.nodes.getNode(nodeId); | ||
if (node) { | ||
node.status({ | ||
fill: "green", | ||
shape: "dot", | ||
text: (node.config.state in dataParsed.state) ? dataParsed.state[node.config.state] : "connected" | ||
}); | ||
if (dataParsed.uniqueid === item) { | ||
var node = RED.nodes.getNode(nodeId); | ||
if (node) { | ||
node.status({ | ||
fill: "green", | ||
shape: "dot", | ||
text: (node.config.state in dataParsed.state) ? dataParsed.state[node.config.state] : "connected" | ||
}); | ||
node.send({ | ||
payload: (node.config.state in dataParsed.state) ? dataParsed.state[node.config.state] : dataParsed.state, | ||
event: dataParsed | ||
}); | ||
node.send({ | ||
payload: (node.config.state in dataParsed.state) ? dataParsed.state[node.config.state] : dataParsed.state, | ||
event: dataParsed | ||
}); | ||
} | ||
} | ||
@@ -287,0 +290,0 @@ } |
@@ -33,3 +33,3 @@ { | ||
}, | ||
"version": "0.2.2" | ||
"version": "0.2.3" | ||
} |
@@ -45,7 +45,10 @@ RED.nodes.registerType('deconz-get', { | ||
}); | ||
this.device_name = selectedOptions.map(function () { | ||
return $(this).text(); | ||
}); | ||
} else { | ||
this.device = null; | ||
this.device_name = this.device = null; | ||
} | ||
} | ||
}); |
@@ -16,2 +16,5 @@ RED.nodes.registerType('deconz-input', { | ||
}, | ||
device_name: { | ||
value: null | ||
}, | ||
state: { | ||
@@ -30,5 +33,8 @@ value: "" | ||
label = this.name; | ||
} else if (typeof(this.device_name) == 'string' && this.device_name.length) { | ||
label = this.device_name; | ||
} else if (typeof(this.device) == 'string' && this.device.length) { | ||
label = this.device; | ||
} | ||
return label; | ||
@@ -43,3 +49,2 @@ }, | ||
$deviceInput.on('change', function(){ | ||
@@ -52,5 +57,2 @@ deconz_getItemStateList(0, '#node-input-state'); | ||
}, 100); //we need small timeout, too fire change event for server select | ||
}, | ||
@@ -63,6 +65,8 @@ oneditsave: function () { | ||
}); | ||
this.device_name = selectedOptions.text(); | ||
} else { | ||
this.device = null; | ||
this.device_name = this.device = null; | ||
} | ||
} | ||
}); |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
519876
1942