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

Change waitOnEventOrTimeout, in web/ui_utils.js, to return a regular Promise and remove the createPromiseCapability import

Browse Source 
*Another small piece of clean-up of code I've previously written; follow-up to PR 8775.*

Importing `createPromiseCapability`, and then using it in just *one* spot, seems unnecessary since the `waitOnEventOrTimeout` function may just as well return a regular `Promise` directly.
This commit is contained in:
Jonas Jenwald 2018-07-16 13:40:51 +02:00
parent 61db85ab64
commit 647fa74793
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
web/ui_utils.js
View File

@ -13,8 +13,6 @@
* limitations under the License. * limitations under the License.
*/ */
import { createPromiseCapability } from 'pdfjs-lib';
const CSS_UNITS = 96.0 / 72.0; const CSS_UNITS = 96.0 / 72.0;
const DEFAULT_SCALE_VALUE = 'auto'; const DEFAULT_SCALE_VALUE = 'auto';
const DEFAULT_SCALE = 1.0; const DEFAULT_SCALE = 1.0;
@ -634,37 +632,35 @@ const WaitOnType = {
* @returns {Promise} A promise that is resolved with a {WaitOnType} value. * @returns {Promise} A promise that is resolved with a {WaitOnType} value.
*/ */
function waitOnEventOrTimeout({ target, name, delay = 0, }) { function waitOnEventOrTimeout({ target, name, delay = 0, }) {
if (typeof target !== 'object' || !(name && typeof name === 'string') || return new Promise(function(resolve, reject) {
!(Number.isInteger(delay) && delay >= 0)) { if (typeof target !== 'object' || !(name && typeof name === 'string') ||
return Promise.reject( !(Number.isInteger(delay) && delay >= 0)) {
new Error('waitOnEventOrTimeout - invalid parameters.')); throw new Error('waitOnEventOrTimeout - invalid parameters.');
} }
let capability = createPromiseCapability();
function handler(type) { function handler(type) {
if (target instanceof EventBus) {
target.off(name, eventHandler);
} else {
target.removeEventListener(name, eventHandler);
}
if (timeout) {
clearTimeout(timeout);
}
resolve(type);
}
const eventHandler = handler.bind(null, WaitOnType.EVENT);
if (target instanceof EventBus) { if (target instanceof EventBus) {
target.off(name, eventHandler); target.on(name, eventHandler);
} else { } else {
target.removeEventListener(name, eventHandler); target.addEventListener(name, eventHandler);
} }
if (timeout) { const timeoutHandler = handler.bind(null, WaitOnType.TIMEOUT);
clearTimeout(timeout); let timeout = setTimeout(timeoutHandler, delay);
} });
capability.resolve(type);
}
let eventHandler = handler.bind(null, WaitOnType.EVENT);
if (target instanceof EventBus) {
target.on(name, eventHandler);
} else {
target.addEventListener(name, eventHandler);
}
let timeoutHandler = handler.bind(null, WaitOnType.TIMEOUT);
let timeout = setTimeout(timeoutHandler, delay);
return capability.promise;
} }
/** /**