Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary 2018-10-07 12:02:29 +01:00
commit e24c22f9be
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 4 additions and 2 deletions

View File

@ -275,7 +275,8 @@ RED.palette = (function() {
}
for (var i=0;i<nodes.length;i++) {
if (d3.select(nodes[i]).classed('link_background')) {
var node = d3.select(nodes[i]);
if (node.classed('link_background') && !node.classed('link_link')) {
var length = nodes[i].getTotalLength();
for (var j=0;j<length;j+=10) {
var p = nodes[i].getPointAtLength(j);

View File

@ -132,7 +132,7 @@ RED.sidebar.context = (function() {
content: content,
toolbar: footerToolbar,
// pinned: true,
enableOnEdit: false,
enableOnEdit: true,
action: "core:show-context-tab"
});

View File

@ -2513,6 +2513,7 @@ RED.view = (function() {
var l = d3.select(this);
d.added = true;
l.append("svg:path").attr("class","link_background link_path")
.classed("link_link", function(d) { return d.link })
.on("mousedown",function(d) {
mousedown_link = d;
clearSelection();