From 3ed1bc917d222ac0cd20014c2dcc00e5a4022d03 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Thu, 5 Mar 2020 12:00:44 +0100
Subject: [PATCH] Update the `waitOnEventOrTimeout` helper function to handle
 internal events consistently with the rest of the viewer components (PR 11631
 follow-up)

I overlooked this in PR 11631; sorry about that!

Also, ensure that `EventBus` instances *always* track "external" events using a boolean regardless of the actual option value.
---
 web/ui_utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/ui_utils.js b/web/ui_utils.js
index d43564141..17cad2c82 100644
--- a/web/ui_utils.js
+++ b/web/ui_utils.js
@@ -716,7 +716,7 @@ function waitOnEventOrTimeout({ target, name, delay = 0 }) {
 
     function handler(type) {
       if (target instanceof EventBus) {
-        target.off(name, eventHandler);
+        target._off(name, eventHandler);
       } else {
         target.removeEventListener(name, eventHandler);
       }
@@ -729,7 +729,7 @@ function waitOnEventOrTimeout({ target, name, delay = 0 }) {
 
     const eventHandler = handler.bind(null, WaitOnType.EVENT);
     if (target instanceof EventBus) {
-      target.on(name, eventHandler);
+      target._on(name, eventHandler);
     } else {
       target.addEventListener(name, eventHandler);
     }
@@ -829,7 +829,7 @@ class EventBus {
     }
     eventListeners.push({
       listener,
-      external: options ? options.external : false,
+      external: (options && options.external) === true,
     });
   }