frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixup merge

This commit is contained in:
Nick O'Leary 2021-01-18 15:11:24 +00:00
parent 7531314e3f
commit 9f71dbb006
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/node_modules/@node-red/editor-client/src/js/red.js vendored
View File

@ -25,7 +25,6 @@ var RED = (function() {
cache: false,
url: 'plugins',
success: function(data) {
console.log(data);
loader.reportProgress(RED._("event.loadPlugins"), 13)
RED.i18n.loadPluginCatalogs(function() {
loadPlugins(function() {

5
packages/node_modules/@node-red/registry/lib/loader.js vendored
View File

@ -478,7 +478,6 @@ function addModule(module) {
return Promise.reject(e);
}
try {
<<<<<<< HEAD
var moduleFiles = {};
var moduleStack = [module];
while(moduleStack.length > 0) {
@ -502,10 +501,6 @@ function addModule(module) {
}
}
return loadNodeFiles(moduleFiles).then(() => module)
=======
var moduleFiles = localfilesystem.getModuleFiles(module);
return loadModuleFiles(moduleFiles);
>>>>>>> Initial plugin runtime api implementation
} catch(err) {
return Promise.reject(err);
}