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

Refactor the OverlayManager to utilize async methods rather than manually returning Promises

Browse Source
This commit is contained in:
Jonas Jenwald 2018-07-30 16:39:06 +02:00
parent b0fa02e845
commit 64e70fc16f
1 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/overlay_manager.js
View File

@ -37,8 +37,8 @@ class OverlayManager {
* @returns {Promise} A promise that is resolved when the overlay has been * @returns {Promise} A promise that is resolved when the overlay has been
* registered. * registered.
*/ */
register(name, element, callerCloseMethod = null, canForceClose = false) { async register(name, element, callerCloseMethod = null,
return new Promise((resolve) => { canForceClose = false) {
let container; let container;
if (!name || !element || !(container = element.parentNode)) { if (!name || !element || !(container = element.parentNode)) {
throw new Error('Not enough parameters.'); throw new Error('Not enough parameters.');
@ -51,8 +51,6 @@ class OverlayManager {
callerCloseMethod, callerCloseMethod,
canForceClose, canForceClose,
}; };
resolve();
});
} }
/** /**
@ -60,16 +58,13 @@ class OverlayManager {
* @returns {Promise} A promise that is resolved when the overlay has been * @returns {Promise} A promise that is resolved when the overlay has been
* unregistered. * unregistered.
*/ */
unregister(name) { async unregister(name) {
return new Promise((resolve) => {
if (!this._overlays[name]) { if (!this._overlays[name]) {
throw new Error('The overlay does not exist.'); throw new Error('The overlay does not exist.');
} else if (this._active === name) { } else if (this._active === name) {
throw new Error('The overlay cannot be removed while it is active.'); throw new Error('The overlay cannot be removed while it is active.');
} }
delete this._overlays[name]; delete this._overlays[name];
resolve();
});
} }
/** /**
@ -77,8 +72,7 @@ class OverlayManager {
* @returns {Promise} A promise that is resolved when the overlay has been * @returns {Promise} A promise that is resolved when the overlay has been
* opened. * opened.
*/ */
open(name) { async open(name) {
return new Promise((resolve) => {
if (!this._overlays[name]) { if (!this._overlays[name]) {
throw new Error('The overlay does not exist.'); throw new Error('The overlay does not exist.');
} else if (this._active) { } else if (this._active) {
@ -95,8 +89,6 @@ class OverlayManager {
this._overlays[this._active].container.classList.remove('hidden'); this._overlays[this._active].container.classList.remove('hidden');
window.addEventListener('keydown', this._keyDownBound); window.addEventListener('keydown', this._keyDownBound);
resolve();
});
} }
/** /**
@ -104,8 +96,7 @@ class OverlayManager {
* @returns {Promise} A promise that is resolved when the overlay has been * @returns {Promise} A promise that is resolved when the overlay has been
* closed. * closed.
*/ */
close(name) { async close(name) {
return new Promise((resolve) => {
if (!this._overlays[name]) { if (!this._overlays[name]) {
throw new Error('The overlay does not exist.'); throw new Error('The overlay does not exist.');
} else if (!this._active) { } else if (!this._active) {
@ -118,8 +109,6 @@ class OverlayManager {
this._active = null; this._active = null;
window.removeEventListener('keydown', this._keyDownBound); window.removeEventListener('keydown', this._keyDownBound);
resolve();
});
} }
/** /**