mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Fixup merge
This commit is contained in:
parent
7531314e3f
commit
9f71dbb006
@ -25,7 +25,6 @@ var RED = (function() {
|
|||||||
cache: false,
|
cache: false,
|
||||||
url: 'plugins',
|
url: 'plugins',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
console.log(data);
|
|
||||||
loader.reportProgress(RED._("event.loadPlugins"), 13)
|
loader.reportProgress(RED._("event.loadPlugins"), 13)
|
||||||
RED.i18n.loadPluginCatalogs(function() {
|
RED.i18n.loadPluginCatalogs(function() {
|
||||||
loadPlugins(function() {
|
loadPlugins(function() {
|
||||||
|
@ -478,7 +478,6 @@ function addModule(module) {
|
|||||||
return Promise.reject(e);
|
return Promise.reject(e);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
<<<<<<< HEAD
|
|
||||||
var moduleFiles = {};
|
var moduleFiles = {};
|
||||||
var moduleStack = [module];
|
var moduleStack = [module];
|
||||||
while(moduleStack.length > 0) {
|
while(moduleStack.length > 0) {
|
||||||
@ -502,10 +501,6 @@ function addModule(module) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return loadNodeFiles(moduleFiles).then(() => module)
|
return loadNodeFiles(moduleFiles).then(() => module)
|
||||||
=======
|
|
||||||
var moduleFiles = localfilesystem.getModuleFiles(module);
|
|
||||||
return loadModuleFiles(moduleFiles);
|
|
||||||
>>>>>>> Initial plugin runtime api implementation
|
|
||||||
} catch(err) {
|
} catch(err) {
|
||||||
return Promise.reject(err);
|
return Promise.reject(err);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user