diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 65c01c6778d6..7201f03355c2 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -1270,7 +1270,7 @@ xmlns="http://www.w3.org/1999/xhtml" + flex="1" tabcontainer="tabbrowser-tabs"> diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js index 729a93486364..018b2f90a1d9 100644 --- a/toolkit/content/widgets/tabbox.js +++ b/toolkit/content/widgets/tabbox.js @@ -14,27 +14,13 @@ class MozTabbox extends MozXULElement { } connectedCallback() { - switch (this.getAttribute("eventnode")) { - case "parent": - this._eventNode = this.parentNode; - break; - case "window": - this._eventNode = window; - break; - case "document": - this._eventNode = document; - break; - default: - this._eventNode = this; - } - - Services.els.addSystemEventListener(this._eventNode, "keydown", this, false); + Services.els.addSystemEventListener(document, "keydown", this, false); window.addEventListener("unload", this.disconnectedCallback, { once: true }); } disconnectedCallback() { window.removeEventListener("unload", this.disconnectedCallback); - Services.els.removeSystemEventListener(this._eventNode, "keydown", this, false); + Services.els.removeSystemEventListener(document, "keydown", this, false); } set handleCtrlTab(val) { @@ -113,19 +99,6 @@ class MozTabbox extends MozXULElement { return tabpanels && tabpanels.selectedPanel; } - set eventNode(val) { - if (val != this._eventNode) { - Services.els.addSystemEventListener(val, "keydown", this, false); - Services.els.removeSystemEventListener(this._eventNode, "keydown", this, false); - this._eventNode = val; - } - return val; - } - - get eventNode() { - return this._eventNode; - } - handleEvent(event) { if (!event.isTrusted) { // Don't let untrusted events mess with tabs.