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

Browse Source
This commit is contained in:
Nick O'Leary
2019-07-10 09:30:48 +01:00
parent 85a438a40f 5a65f445f0
commit f1855174f0
282 changed files with 4009 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/registry/lib/library.js vendored
View File

@@ -51,7 +51,6 @@ function getFlowsFromPath(path) {
}
i++;
})
resolve(result);
})
});
@@ -61,6 +60,7 @@ function getFlowsFromPath(path) {
function addNodeExamplesDir(module,path) {
exampleRoots[module] = path;
return getFlowsFromPath(path).then(function(result) {
if (JSON.stringify(result).indexOf('{"f":') === -1) { return; }
exampleFlows = exampleFlows||{};
exampleFlows[module] = result;
});

11
packages/node_modules/@node-red/registry/lib/localfilesystem.js vendored
View File

@@ -372,18 +372,27 @@ function getModuleFiles(module) {
return nodeList;
}
// If this finds an svg and a png with the same name, it will only list the svg
function scanIconDir(dir) {
var iconList = [];
var svgs = {};
try {
var files = fs.readdirSync(dir);
files.forEach(function(file) {
var stats = fs.statSync(path.join(dir, file));
if (stats.isFile() && iconFileExtensions.indexOf(path.extname(file)) !== -1) {
var ext = path.extname(file).toLowerCase();
if (stats.isFile() && iconFileExtensions.indexOf(ext) !== -1) {
iconList.push(file);
if (ext === ".svg") {
svgs[file.substring(0,file.length-4)] = true;
}
}
});
} catch(err) {
}
iconList = iconList.filter(f => {
return /.svg$/i.test(f) || !svgs[f.substring(0,f.length-4)]
})
return iconList;
}