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

Use native Promise instead of when.js

Browse Source
This commit is contained in:
HirokiUchikawa
2018-06-20 19:50:55 +09:00
parent 23b887c30e
commit dd81d947fc
5 changed files with 85 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
red/runtime/nodes/context/index.js
View File

@@ -16,7 +16,6 @@
var clone = require("clone");
var log = require("../../log");
var when = require("when");
var settings;
var contexts = {};
@@ -59,14 +58,14 @@ function load() {
try{
plugin = require("./"+plugins[pluginName].module);
}catch(err){
return when.reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
return Promise.reject(new Error(log._("context.error-module-not-loaded", {module:plugins[pluginName].module})));
}
} else {
plugin = plugins[pluginName].module;
}
externalContexts[pluginName] = plugin(config);
}else{
return when.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
return Promise.reject(new Error(log._("context.error-module-not-defined", {storage:pluginName})));
}
}
for(var plugin in externalContexts){
@@ -78,10 +77,10 @@ function load() {
if(externalContexts.hasOwnProperty(plugins["default"])){
externalContexts["default"] = externalContexts[plugins["default"]];
}else{
return when.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
return Promise.reject(new Error(log._("context.error-invalid-default-module", {storage:plugins["default"]})));
}
}
return when.all(promises);
return Promise.all(promises);
} else {
noContextStorage = true;
return externalContexts["_"].open();
@@ -224,7 +223,7 @@ function deleteContext(id,flowId) {
delete contexts[contextId];
return externalContexts["_"].delete(contextId);
}else{
return when.resolve();
return Promise.resolve();
}
}
@@ -243,7 +242,7 @@ function clean(flowConfig) {
}
}
}
return when.all(promises);
return Promise.all(promises);
}
function close() {
@@ -253,7 +252,7 @@ function close() {
promises.push(externalContexts[plugin].close());
}
}
return when.all(promises);
return Promise.all(promises);
}
module.exports = {