frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into pr_2033

Browse Source
This commit is contained in:
Nick O'Leary 2019-01-22 16:13:26 +00:00
commit 85efb48c1f
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js vendored
View File

@ -326,6 +326,7 @@ RED.sidebar.versionControl = (function() {
.appendTo(bg) .appendTo(bg)
.click(function(evt) { .click(function(evt) {
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation();
refresh(true); refresh(true);
}); });
RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshChanges")); RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshChanges"));
@ -559,6 +560,7 @@ RED.sidebar.versionControl = (function() {
.appendTo(bg) .appendTo(bg)
.click(function(evt) { .click(function(evt) {
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation();
refresh(true,true); refresh(true,true);
}) })
RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshCommitHistory")) RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshCommitHistory"))

5
packages/node_modules/@node-red/runtime/lib/nodes/Node.js vendored
View File

@ -35,7 +35,10 @@ function Node(n) {
this._alias = n._alias; this._alias = n._alias;
} }
if (n._flow) { if (n._flow) {
this._flow = n._flow; // Make this a non-enumerable property as it may cause
// circular references. Any existing code that tries to JSON serialise
// the object (such as dashboard) will not like circular refs
Object.defineProperty(this,'_flow', {value: n._flow, })
} }
this.updateWires(n.wires); this.updateWires(n.wires);
} }