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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary
2018-09-17 11:33:36 +01:00
parent f30ff7a2fd 08fccc4e77
commit 7406ab6017
14 changed files with 487 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/js/ui/utils.js
View File

@@ -826,7 +826,11 @@ RED.utils = (function() {
}
result = nodeColorCache[type];
}
return result;
if (result) {
return result;
} else {
return "#ddd";
}
}
function addSpinnerOverlay(container,contain) {

2
editor/js/ui/view.js
View File

@@ -1766,7 +1766,7 @@ RED.view = (function() {
clickTime = now;
dblClickPrimed = (lastClickNode == mousedown_node &&
d3.event.buttons === 1 &&
d3.event.button === 0 &&
!d3.event.shiftKey && !d3.event.metaKey && !d3.event.altKey && !d3.event.ctrlKey);
lastClickNode = mousedown_node;