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 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary 2021-06-10 14:19:24 +01:00
commit 89c84522d2
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/node_modules/@node-red/editor-client/src/js/ui/utils.js vendored
View File

@ -863,6 +863,7 @@ RED.utils = (function() {
obj[key] = value; obj[key] = value;
} }
} }
function separateIconPath(icon) { function separateIconPath(icon) {
var result = {module: "", file: ""}; var result = {module: "", file: ""};
if (icon) { if (icon) {
@ -870,10 +871,10 @@ RED.utils = (function() {
if (index === 0) { if (index === 0) {
icon = icon.substring((RED.settings.apiRootUrl+'icons/').length); icon = icon.substring((RED.settings.apiRootUrl+'icons/').length);
} }
index = icon.indexOf('/'); var match = /^((?:@[^/]+\/)?[^/]+)\/(.*)$/.exec(icon);
if (index !== -1) { if (match) {
result.module = icon.slice(0, index); result.module = match[1];
result.file = icon.slice(index + 1); result.file = match[2];
} else { } else {
result.file = icon; result.file = icon;
} }