From 5dd0622e403ee422b30c86858396d04ada1200a3 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sun, 28 Aug 2016 12:01:12 +0100
Subject: [PATCH] Let change node move property to sub-property.

---
 nodes/core/logic/15-change.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nodes/core/logic/15-change.js b/nodes/core/logic/15-change.js
index 870370f35..b9b823d37 100644
--- a/nodes/core/logic/15-change.js
+++ b/nodes/core/logic/15-change.js
@@ -209,8 +209,16 @@ module.exports = function(RED) {
                 for (var i=0;i<this.rules.length;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});
+                        if (r.to.indexOf(r.pt) !== -1) {
+                            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 { // 2 step move if we are moving to a child
+                            msg = applyRule(msg,{t:"set", p:"_temp_move", pt:r.tot, to:r.p, tot:r.pt});
+                            applyRule(msg,{t:"delete", p:r.p, pt:r.pt});
+                            msg = applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:"_temp_move", tot:r.pt});
+                            applyRule(msg,{t:"delete", p:"_temp_move", pt:r.pt});
+                        }
                     } else {
                         msg = applyRule(msg,this.rules[i]);
                     }