refactor: rename hasFired to eventOn

which feels slightly more descriptive

Author: gruhn

src/misc/camera.js

@@ -1,7 +1,7 @@
 import adapterFactory from "webrtc-adapter/src/js/adapter_factory.js";
 import { StreamApiNotSupportedError } from "./errors.js";
 import { imageDataFromVideo } from "./image-data.js";
-import { hasFired } from "./promisify.js";
+import { eventOn } from "./promisify.js";
 
 class Camera {
   constructor(videoEl, stream) {
@@ -36,7 +36,6 @@ export default async function(constraints, videoEl) {
   }
 
   const stream = await navigator.mediaDevices.getUserMedia(constraints);
-  const streamLoaded = hasFired(videoEl, "loadeddata", "error");
 
   if (videoEl.srcObject !== undefined) {
     videoEl.srcObject = stream;
@@ -50,7 +49,7 @@ export default async function(constraints, videoEl) {
     videoEl.src = stream;
   }
 
-  await streamLoaded;
+  await eventOn(videoEl, "loadeddata");
 
   return new Camera(videoEl, stream);
 }

src/misc/image-data.js

@@ -1,5 +1,5 @@
 import { DropImageFetchError, DropImageDecodeError } from "./errors.js";
-import { hasFired } from "./promisify.js";
+import { eventOn } from "./promisify.js";
 
 const canvas = document.createElement("canvas");
 const canvasCtx = canvas.getContext("2d");
@@ -41,23 +41,21 @@ export async function imageDataFromUrl(url) {
   }
 
   const image = document.createElement("img");
-  const imageLoaded = hasFired(image, "load");
-
   image.src = url;
 
-  await imageLoaded;
+  await eventOn(image, "load");
 
   return imageDataFromImage(image);
 }
 
 export async function imageDataFromFile(file) {
   if (/image.*/.test(file.type)) {
     const reader = new FileReader();
-    const readerLoaded = hasFired(reader, "load");
 
     reader.readAsDataURL(file);
 
-    const dataURL = (await readerLoaded).target.result;
+    const result = await eventOn(reader, "load");
+    const dataURL = result.target.result;
 
     return imageDataFromUrl(dataURL);
   } else {

src/misc/promisify.js

@@ -1,4 +1,4 @@
-export function hasFired(eventTarget, successEvent, errorEvent = "error") {
+export function eventOn(eventTarget, successEvent, errorEvent = "error") {
   let $resolve, $reject;
 
   const promise = new Promise((resolve, reject) => {

src/misc/scanner.js

@@ -1,12 +1,12 @@
-import { hasFired } from "./promisify.js";
+import { eventOn } from "./promisify.js";
 import Worker from "./worker.js";
 
 export async function scan(imageData) {
   const worker = new Worker();
 
   worker.postMessage(imageData, [imageData.data.buffer]);
 
-  const event = await hasFired(worker, "message");
+  const event = await eventOn(worker, "message");
 
   worker.terminate();