mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 09:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Bugfix: Async bump part 2

Browse source 
Sorry, not sure what happened but having kids jump all over the keyboard while I do this probably didn't help... :|
This commit is contained in:
John McLear 2020-07-17 10:08:40 +01:00 • committed by GitHub
parent b3680058ff
commit d1330a1e1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/static/js/pluginfw/hooks.js
View file

@ -1,4 +1,3 @@
var async = require("async");
var _ = require("underscore");
exports.bubbleExceptions = true
@ -78,19 +77,22 @@ exports.callAll = function (hook_name, args) {
}
}
function aCallAll(hook_name, args, cb) {
async function aCallAll(hook_name, args, cb) {
if (!args) args = {};
if (!cb) cb = function () {};
if (exports.plugins.hooks[hook_name] === undefined) return cb(null, []);
async.map(
exports.plugins.hooks[hook_name],
function (hook, cb) {
hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); });
},
function (err, res) {
cb(null, _.flatten(res, true));
}
);
var newArray = [];
// This should be a map.
await exports.plugins.hooks[hook_name].forEach(async function(hook, index){
let test = await hookCallWrapper(hook, hook_name, args, function (res) {
return Promise.resolve(res);
});
newArray.push(test)
});
// after forEach
cb(null, _.flatten(newArray, true));
}
/* return a Promise if cb is not supplied */