Merge branch 'dev' into pr_2042

packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js

@@ -265,7 +265,6 @@ class Flow {
         return Promise.all(promises);
     }
 
-
     /**
      * Update the flow definition. This doesn't change anything that is running.
      * This should be called after `stop` and before `start`.
@@ -281,11 +280,13 @@ class Flow {
     /**
      * Get a node instance from this flow. If the node is not known to this
      * flow, pass the request up to the parent.
-     * @param  {[type]} id [description]
+     * @param  {String} id [description]
+     * @param  {Boolean} cancelBubble    if true, prevents the flow from passing the request to the parent
+     *                                   This stops infinite loops when the parent asked this Flow for the
+     *                                   node to begin with.
      * @return {[type]}    [description]
      */
-    getNode(id) {
-        // console.log('getNode',id,!!this.activeNodes[id])
+    getNode(id, cancelBubble) {
         if (!id) {
             return undefined;
         }
@@ -298,7 +299,10 @@ class Flow {
             // TEMP: this is a subflow internal node within this flow
             return this.activeNodes[id];
         }
-        return this.parent.getNode(id);
+        if (!cancelBubble) {
+            return this.parent.getNode(id);
+        }
+        return undefined;
     }
 
     /**