Skip to content

Commit bc3159a

Browse files
committed
chore: followup bug 2021694 - Make other XUL frame attributes regular bool attrs
1 parent 59a6898 commit bc3159a

File tree

8 files changed

+15
-10
lines changed

8 files changed

+15
-10
lines changed

@types/general.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ declare namespace MockedGeckoTypes {
144144
readonly currentURI: URI;
145145
droppedLinkHandler: typeof handleDroppedLink;
146146
getAttribute(name: string): string | null;
147+
hasAttribute(name: string): boolean;
147148
focus(): void;
148149
// we overrife these see addon.d.ts
149150
// fixupAndLoadURIString: (uri: string, loadURIOptions?: LoadURIOptions) => void;

@types/modules.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,6 +1540,7 @@ declare namespace TabmixSvcModule {
15401540
i10IdMap: I10Map;
15411541
isFixedGoogleUrl: (url: string) => boolean;
15421542
isGlitterInstalled?: boolean;
1543+
isRemoteBrowser: (browser: MockedGeckoTypes.ChromeBrowser) => boolean;
15431544
newtabUrl: string;
15441545
setCustomTabValue: (tab: Tab, key: string, value?: unknown) => void;
15451546
setLabel: (property: string) => string;

addon/chrome/content/click/click.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ var TabmixContext = {
11851185
// for remote tab get call getValidUrl when it is safe to use CPOWs
11861186
// getValidUrl may call getParamsForLink
11871187
if (
1188-
tab.linkedBrowser.getAttribute("remote") == "true" &&
1188+
TabmixSvc.isRemoteBrowser(tab.linkedBrowser) &&
11891189
onLink &&
11901190
(Tabmix.prefs.getBoolPref("openLinkHere") ||
11911191
Tabmix.prefs.getBoolPref("openInverseLink") ||

addon/chrome/content/minit/tablib.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,10 +1411,7 @@ Tabmix.tablib = {
14111411
};
14121412

14131413
let browser = gBrowser.selectedBrowser;
1414-
if (
1415-
browser.getAttribute("remote") == "true" &&
1416-
typeof gContextMenu.tabmixLinkURL != "undefined"
1417-
) {
1414+
if (TabmixSvc.isRemoteBrowser(browser) && typeof gContextMenu.tabmixLinkURL != "undefined") {
14181415
return gContextMenu.tabmixLinkURL;
14191416
}
14201417

@@ -1970,7 +1967,7 @@ Tabmix.tablib = {
19701967
}
19711968

19721969
if (
1973-
aBrowser.getAttribute("remote") == "true" &&
1970+
TabmixSvc.isRemoteBrowser(aBrowser) &&
19741971
aTab._restoreState == 2 &&
19751972
this.labels.indexOf(aTab.label) > -1
19761973
) {

addon/modules/AutoReload.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ function _reloadTab(aTab) {
353353
}
354354

355355
var browser = aTab.linkedBrowser;
356-
if (browser.getAttribute("remote")) {
356+
if (TabmixSvc.isRemoteBrowser(browser)) {
357357
browser.messageManager.sendAsyncMessage("Tabmix:collectReloadData", {});
358358
return;
359359
}

addon/modules/ContentClick.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ ContentClickInternal = {
289289
}
290290

291291
let targetAttr = wrappedNode && wrappedNode.target;
292-
if (href && browser.getAttribute("remote") == "true" && where == "default" && targetAttr) {
292+
if (href && lazy.TabmixSvc.isRemoteBrowser(browser) && where == "default" && targetAttr) {
293293
let win = this._window;
294294
win.setTimeout(() => {
295295
// don't try to select new tab if the original browser is no longer
@@ -1235,7 +1235,7 @@ ContentClickInternal = {
12351235
}
12361236
if (tab && !tab.hasAttribute("pending")) {
12371237
let browser = tab.linkedBrowser;
1238-
if (browser.getAttribute("remote") == "true") {
1238+
if (lazy.TabmixSvc.isRemoteBrowser(browser)) {
12391239
browser.messageManager.sendAsyncMessage("Tabmix:isFrameInContent", this.frameData);
12401240
} else if (this.frameData) {
12411241
let result = lazy.LinkNodeUtils.isFrameInContent(

addon/modules/MergeWindows.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ export const MergeWindows = {
233233
if (placePopupNextToOpener) {
234234
let browser = tab.linkedBrowser;
235235
openerWindowID = browser.browsingContext?.opener?.currentWindowGlobal?.outerWindowId;
236-
if (!openerWindowID && browser.getAttribute("remote") == "true") {
236+
if (!openerWindowID && TabmixSvc.isRemoteBrowser(browser)) {
237237
tab.__tabmixTabBrowser = tabbrowser;
238238
browser.messageManager.sendAsyncMessage("Tabmix:collectOpener", {});
239239
waitToMessage = true;

addon/modules/TabmixSvc.sys.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,12 @@ export const TabmixSvc = {
217217
},
218218
};
219219

220+
if (lazy.isVersion(1500)) {
221+
TabmixSvc.isRemoteBrowser = browser => browser.hasAttribute("remote");
222+
} else {
223+
TabmixSvc.isRemoteBrowser = browser => browser.getAttribute("remote") == "true";
224+
}
225+
220226
ChromeUtils.defineLazyGetter(TabmixSvc, "prefs", () => {
221227
const {Preferences} = ChromeUtils.importESModule("resource://gre/modules/Preferences.sys.mjs");
222228
return new Preferences("");

0 commit comments

Comments
 (0)