Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify, and inline, the finalize function in the MessageHandler class

Browse Source 
The `finalize` helper function has only a *single* call-site, and furthermore it's just a one-liner too. Furthermore it's only ever called with a `Promise` as its argument, meaning that it's unnecessarily convoluted as well (i.e. the `Promise.resolve()` part shouldn't be necessary).
Hence this code can be both simplified *and* inlined at its only call-site instead.
This commit is contained in:
Jonas Jenwald 2019-07-13 17:47:39 +02:00
parent b01cc55cfd
commit b548bafef7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/message_handler.js
View File

@ -60,10 +60,6 @@ function resolveOrReject(capability, data) {
} }
} }
function finalize(promise) {
return Promise.resolve(promise).catch(() => {});
}
function MessageHandler(sourceName, targetName, comObj) { function MessageHandler(sourceName, targetName, comObj) {
this.sourceName = sourceName; this.sourceName = sourceName;
this.targetName = targetName; this.targetName = targetName;
@ -326,14 +322,14 @@ MessageHandler.prototype = {
}; };
let deleteStreamController = () => { let deleteStreamController = () => {
// Delete streamController only when start, pull and // Delete the `streamController` only when the start, pull, and cancel
// cancel callbacks are resolved, to avoid "TypeError". // capabilities have settled, to prevent `TypeError`s.
Promise.all([ Promise.all([
this.streamControllers[data.streamId].startCall, this.streamControllers[data.streamId].startCall,
this.streamControllers[data.streamId].pullCall, this.streamControllers[data.streamId].pullCall,
this.streamControllers[data.streamId].cancelCall this.streamControllers[data.streamId].cancelCall
].map(function(capability) { ].map(function(capability) {
return capability && finalize(capability.promise); return capability && capability.promise.catch(function() { });
})).then(() => { })).then(() => {
delete this.streamControllers[data.streamId]; delete this.streamControllers[data.streamId];
}); });