👽️ Replace system event listeners via els on TooltipListenerChild as …

…it is deprecated
dothq · Apr 19, 2024 · 770da49 · 770da49
1 parent 5314395
commit 770da49
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 53 deletions.
diff --git a/actors/DotTooltipListenerChild.sys.mjs b/actors/DotTooltipListenerChild.sys.mjs
@@ -142,25 +142,17 @@ export class DotTooltipListenerChild extends JSWindowActorChild {
 		if (this._currentTooltip) {
 			const doc = this._currentTooltip.ownerDocument;
 
-			Services.els.removeSystemEventListener(doc, "wheel", this, true);
-			Services.els.removeSystemEventListener(
-				doc,
-				"mousedown",
-				this,
-				true
-			);
-			Services.els.removeSystemEventListener(doc, "mouseup", this, true);
-			Services.els.removeSystemEventListener(doc, "keydown", this, true);
+			doc.removeEventListener("wheel", this, true);
+			doc.removeEventListener("mousedown", this, true);
+			doc.removeEventListener("mouseup", this, true);
+			doc.removeEventListener("keydown", this, true);
 
-			Services.els.removeSystemEventListener(
-				this._currentTooltip,
+			this._currentTooltip.removeEventListener(
 				"popupshowing",
 				this,
 				false
 			);
-
-			Services.els.removeSystemEventListener(
-				this._currentTooltip,
+			this._currentTooltip.removeEventListener(
 				"popuphiding",
 				this,
 				false
@@ -362,24 +354,13 @@ export class DotTooltipListenerChild extends JSWindowActorChild {
 			triggerNode || event.target
 		);
 
-		Services.els.addSystemEventListener(
-			tooltip,
-			"popupshowing",
-			this,
-			false
-		);
-
-		Services.els.addSystemEventListener(
-			tooltip,
-			"popuphiding",
-			this,
-			false
-		);
+		tooltip.addEventListener("popupshowing", this, false);
+		tooltip.addEventListener("popuphiding", this, false);
 
-		Services.els.addSystemEventListener(doc, "wheel", this, true);
-		Services.els.addSystemEventListener(doc, "mousedown", this, true);
-		Services.els.addSystemEventListener(doc, "mouseup", this, true);
-		Services.els.addSystemEventListener(doc, "keydown", this, true);
+		doc.addEventListener("wheel", this, true);
+		doc.addEventListener("mousedown", this, true);
+		doc.addEventListener("mouseup", this, true);
+		doc.addEventListener("keydown", this, true);
 
 		Object.defineProperty(tooltip, "triggerNode", {
 			configurable: true,
@@ -540,11 +521,11 @@ export class DotTooltipListenerChild extends JSWindowActorChild {
 	 * @param {Node} node
 	 */
 	addTooltipSupport(node) {
-		Services.els.addSystemEventListener(node, "mouseout", this, false);
-		Services.els.addSystemEventListener(node, "mousemove", this, false);
-		Services.els.addSystemEventListener(node, "mousedown", this, false);
-		Services.els.addSystemEventListener(node, "mouseup", this, false);
-		Services.els.addSystemEventListener(node, "dragstart", this, true);
+		node.addEventListener("mouseout", this, false);
+		node.addEventListener("mousemove", this, false);
+		node.addEventListener("mousedown", this, false);
+		node.addEventListener("mouseup", this, false);
+		node.addEventListener("dragstart", this, true);
 	}
 
 	/**

diff --git a/third_party/dothq/gecko-types/lib/services/els.d.ts b/third_party/dothq/gecko-types/lib/services/els.d.ts
@@ -57,23 +57,7 @@ export interface ServicesEls {
      * Returns true if a event target has any listener for the given type.
      */
     hasListenersFor(aEventTarget: EventTarget, aType: string): boolean;
-
-    /**
-     * Add a system-group eventlistener to a event target.
-     */
-    addSystemEventListener(target: EventTarget,
-                                type: string,
-                                listener: any,
-                                useCapture: boolean): void;
-
-    /**
-     * Remove a system-group eventlistener from a event target.
-     */
-    removeSystemEventListener(target: EventTarget,
-                                type: string,
-                                listener: any,
-                                useCapture: boolean): void;
-
+
     addListenerForAllEvents(target: EventTarget,
                                 listener: any,
                                 aUseCapture?: boolean,