From a986871decd2590f9e3753448a4e62eddcf610e9 Mon Sep 17 00:00:00 2001 From: ArmoredDragon <43324896+Armored-Dragon@users.noreply.github.com> Date: Sat, 24 Jun 2023 11:30:19 -0500 Subject: [PATCH] Remove document event listeners: No longer needed. --- .../resources/html/createGlobalEventBridge.js | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/interface/resources/html/createGlobalEventBridge.js b/interface/resources/html/createGlobalEventBridge.js index 43c92ff1e9..e81d656077 100644 --- a/interface/resources/html/createGlobalEventBridge.js +++ b/interface/resources/html/createGlobalEventBridge.js @@ -1,11 +1,11 @@ // -// createGlobalEventBridge.js +// createGlobalEventBridge.js // -// Created by Anthony J. Thibault on 9/7/2016 -// Copyright 2016 High Fidelity, Inc. +// Created by Anthony J. Thibault on 9/7/2016 +// Copyright 2016 High Fidelity, Inc. // -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // // Stick a EventBridge object in the global namespace. @@ -25,37 +25,16 @@ var EventBridge; this.emitWebEvent = function (message) { self._messages.push(message); }; - }; + } EventBridge = new TempEventBridge(); - var webChannel = new QWebChannel(qt.webChannelTransport, function (channel) { + var webChannel = new QWebChannel(qt.webChannelTransport, (channel) => { + // // replace the TempEventBridge with the real one. var tempEventBridge = EventBridge; EventBridge = channel.objects.eventBridge; - - // To be able to update the state of the output device selection for every element added to the DOM - // we need to listen to events that might precede the addition of this elements. - // A more robust hack will be to add a setInterval that look for DOM changes every 100-300 ms (low performance?) - - window.addEventListener("load",function(event) { - setTimeout(function() { - // EventBridge.forceHtmlAudioOutputDeviceUpdate(); - }, 1200); - }, false); - - document.addEventListener("click",function(){ - setTimeout(function() { - // EventBridge.forceHtmlAudioOutputDeviceUpdate(); - }, 1200); - }, false); - - document.addEventListener("change",function(){ - setTimeout(function() { - // EventBridge.forceHtmlAudioOutputDeviceUpdate(); - }, 1200); - }, false); - + tempEventBridge._callbacks.forEach(function (callback) { EventBridge.scriptEventReceived.connect(callback); });