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

Add Move capability to change node

Browse Source
This commit is contained in:
Dave Conway-Jones
2016-04-10 12:20:46 +01:00
parent 736ddaeca4
commit 2954ae917b
3 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nodes/core/logic/15-change.js
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2013, 2015 IBM Corp.
* Copyright 2013, 2016 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,14 +21,13 @@ module.exports = function(RED) {
RED.nodes.createNode(this, n);
this.rules = n.rules;
if (!this.rules) {
var rule = {
t:(n.action=="replace"?"set":n.action),
p:n.property||""
}
if (rule.t === "set") {
if ((rule.t === "set")||(rule.t === "move")) {
rule.to = n.to||"";
} else if (rule.t === "change") {
rule.from = n.from||"";
@@ -38,10 +37,7 @@ module.exports = function(RED) {
this.rules = [rule];
}
this.actions = [];
var valid = true;
for (var i=0;i<this.rules.length;i++) {
var rule = this.rules[i];
// Migrate to type-aware rules
@@ -105,7 +101,6 @@ module.exports = function(RED) {
} else if (rule.tot === 'global') {
value = node.context().global.get(rule.to);
}
if (rule.t === 'change') {
if (rule.fromt === 'msg' || rule.fromt === 'flow' || rule.fromt === 'global') {
if (rule.fromt === "msg") {
@@ -130,9 +125,8 @@ module.exports = function(RED) {
} catch (e) {
valid = false;
node.error(RED._("change.errors.invalid-from",{error:e.message}));
return
return;
}
} else {
node.error(RED._("change.errors.invalid-from",{error:"unsupported type: "+(typeof fromValue)}));
return
@@ -203,7 +197,6 @@ module.exports = function(RED) {
}
}
}
}
} catch(err) {/*console.log(err.stack)*/}
return msg;
@@ -212,7 +205,13 @@ module.exports = function(RED) {
var node = this;
this.on('input', function(msg) {
for (var i=0;i<this.rules.length;i++) {
msg = applyRule(msg,this.rules[i]);
if (this.rules[i].t === "move") {
var r = this.rules[i];
msg = applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt});
applyRule(msg,{t:"delete", p:r.p, pt:r.pt});
} else {
msg = applyRule(msg,this.rules[i]);
}
if (msg === null) {
return;
}