mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Merge branch 'master' into Bugs/not-loading-missing-subflow
This commit is contained in:
commit
667d8673d4
10
.github/workflows/tests.yml
vendored
10
.github/workflows/tests.yml
vendored
@ -29,8 +29,8 @@ jobs:
|
|||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: |
|
run: |
|
||||||
npm run test
|
npm run test
|
||||||
- name: Publish to coveralls.io
|
# - name: Publish to coveralls.io
|
||||||
if: ${{ matrix.node-version == 14 }}
|
# if: ${{ matrix.node-version == 14 }}
|
||||||
uses: coverallsapp/github-action@v1.1.2
|
# uses: coverallsapp/github-action@v1.1.2
|
||||||
with:
|
# with:
|
||||||
github-token: ${{ github.token }}
|
# github-token: ${{ github.token }}
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
http://nodered.org
|
http://nodered.org
|
||||||
|
|
||||||
[![Build Status](https://github.com/node-red/node-red/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/node-red/node-red/actions?query=branch%3Amaster)
|
[![Build Status](https://github.com/node-red/node-red/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/node-red/node-red/actions?query=branch%3Amaster)
|
||||||
[![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
|
|
||||||
|
|
||||||
Low-code programming for event-driven applications.
|
Low-code programming for event-driven applications.
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ RED.actionList = (function() {
|
|||||||
var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
|
var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
|
||||||
searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
|
searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
|
||||||
change: function() {
|
change: function() {
|
||||||
filterTerm = $(this).val().trim();
|
filterTerm = $(this).val().trim().toLowerCase();
|
||||||
filterTerms = filterTerm.split(" ");
|
filterTerms = filterTerm.split(" ");
|
||||||
searchResults.editableList('filter');
|
searchResults.editableList('filter');
|
||||||
searchResults.find("li.selected").removeClass("selected");
|
searchResults.find("li.selected").removeClass("selected");
|
||||||
|
@ -663,24 +663,23 @@ RED.subflow = (function() {
|
|||||||
var candidateOutputs = [];
|
var candidateOutputs = [];
|
||||||
var candidateInputNodes = {};
|
var candidateInputNodes = {};
|
||||||
|
|
||||||
var boundingBox = [nodeList[0].x,
|
var boundingBox = [nodeList[0].x-(nodeList[0].w/2),
|
||||||
nodeList[0].y,
|
nodeList[0].y-(nodeList[0].h/2),
|
||||||
nodeList[0].x,
|
nodeList[0].x+(nodeList[0].w/2),
|
||||||
nodeList[0].y];
|
nodeList[0].y+(nodeList[0].h/2)];
|
||||||
|
|
||||||
for (i=0;i<nodeList.length;i++) {
|
for (i=0;i<nodeList.length;i++) {
|
||||||
n = nodeList[i];
|
n = nodeList[i];
|
||||||
nodes[n.id] = {n:n,outputs:{}};
|
nodes[n.id] = {n:n,outputs:{}};
|
||||||
boundingBox = [
|
boundingBox = [
|
||||||
Math.min(boundingBox[0],n.x),
|
Math.min(boundingBox[0],n.x-(n.w/2)),
|
||||||
Math.min(boundingBox[1],n.y),
|
Math.min(boundingBox[1],n.y-(n.h/2)),
|
||||||
Math.max(boundingBox[2],n.x),
|
Math.max(boundingBox[2],n.x+(n.w/2)),
|
||||||
Math.max(boundingBox[3],n.y)
|
Math.max(boundingBox[3],n.y+(n.h/2))
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
var offsetX = snapToGrid(boundingBox[0] - 200);
|
var offsetX = snapToGrid(boundingBox[0] - 140);
|
||||||
var offsetY = snapToGrid(boundingBox[1] - 80);
|
var offsetY = snapToGrid(boundingBox[1] - 60);
|
||||||
|
|
||||||
|
|
||||||
var center = [
|
var center = [
|
||||||
snapToGrid((boundingBox[2]+boundingBox[0]) / 2),
|
snapToGrid((boundingBox[2]+boundingBox[0]) / 2),
|
||||||
|
@ -124,7 +124,7 @@
|
|||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding:0;
|
padding:0;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
li {
|
li {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
padding:0;
|
padding:0;
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
.red-ui-palette-search {
|
.red-ui-palette-search {
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: var(--red-ui-secondary-background);
|
background: var(--red-ui-form-input-background);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
height: 35px;
|
height: 35px;
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
padding: 8px;
|
padding: 8px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
background: var(--red-ui-popover-background);
|
background: var(--red-ui-popover-background);
|
||||||
|
overflow-wrap: anywhere;
|
||||||
}
|
}
|
||||||
.red-ui-popover:after, .red-ui-popover:before {
|
.red-ui-popover:after, .red-ui-popover:before {
|
||||||
border: solid transparent;
|
border: solid transparent;
|
||||||
|
@ -108,6 +108,8 @@
|
|||||||
}
|
}
|
||||||
.red-ui-search-result-node-label {
|
.red-ui-search-result-node-label {
|
||||||
color: var(--red-ui-secondary-text-color);
|
color: var(--red-ui-secondary-text-color);
|
||||||
|
width: 240px;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
> span {
|
> span {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
}
|
}
|
||||||
border-bottom: 1px solid var(--red-ui-secondary-border-color);
|
border-bottom: 1px solid var(--red-ui-secondary-border-color);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user