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 '0.18' into projects

Browse Source
This commit is contained in:
Nick O'Leary
2018-01-22 23:17:28 +00:00
parent f3cf58c8ff 6b466d217a
commit 84711beec0
34 changed files with 3191 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ RED.editor = (function() {
}
}
}
if (!node._def.defaults.hasOwnProperty("icon") && node.icon) {
if (node._def.hasOwnProperty("defaults") && !node._def.defaults.hasOwnProperty("icon") && node.icon) {
var iconPath = RED.utils.separateIconPath(node.icon);
var iconSets = RED.nodes.getIconSets();
var iconFileList = iconSets[iconPath.module];

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

@@ -81,6 +81,9 @@ RED.view = (function() {
.style("cursor","crosshair")
.on("mousedown", function() {
focusView();
})
.on("contextmenu", function(){
d3.event.preventDefault();
});
var vis = outer
@@ -1392,7 +1395,7 @@ RED.view = (function() {
function portMouseUp(d,portType,portIndex) {
var i;
if (mouse_mode === RED.state.QUICK_JOINING) {
if (mouse_mode === RED.state.QUICK_JOINING && drag_lines.length > 0) {
if (drag_lines[0].node===d) {
return
}