Skip to content

Commit 96b1b25

Browse files
committed
Backed out 2 changesets (bug 1864896) for causing node failures. CLOSED TREE
Backed out changeset adba0b352699 (bug 1864896) Backed out changeset 153146ce081c (bug 1864896)
1 parent 8c2521e commit 96b1b25

File tree

79 files changed

+232
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+232
-217
lines changed

browser/components/asrouter/actors/ASRouterChild.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class ASRouterChild extends JSWindowActorChild {
4343
});
4444
}
4545

46-
handleEvent() {
46+
handleEvent(event) {
4747
// DOMDocElementCreated is only used to create the actor.
4848
}
4949

browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export class ASRouterAdminInner extends React.PureComponent {
258258
ASRouterUtils.sendMessage({ type: "RESET_PROVIDER_PREF" });
259259
}
260260

261-
resetGroups() {
261+
resetGroups(id, value) {
262262
ASRouterUtils.sendMessage({
263263
type: "RESET_GROUPS_STATE",
264264
}).then(this.setStateFromParent);
@@ -387,7 +387,7 @@ export class ASRouterAdminInner extends React.PureComponent {
387387
}
388388

389389
// Simulate a copy event that sets to clipboard all targeting paramters and values
390-
onCopyTargetingParams() {
390+
onCopyTargetingParams(event) {
391391
const stringTargetingParameters = {
392392
...this.state.stringTargetingParameters,
393393
};
@@ -507,7 +507,7 @@ export class ASRouterAdminInner extends React.PureComponent {
507507
isBlocked ? null : isModified ? (
508508
<button
509509
className="button restore"
510-
onClick={() => this.resetJSON(msg)}
510+
onClick={e => this.resetJSON(msg)}
511511
>
512512
Reset
513513
</button>
@@ -523,7 +523,7 @@ export class ASRouterAdminInner extends React.PureComponent {
523523
{isBlocked ? null : (
524524
<button
525525
className="button modify"
526-
onClick={() => this.modifyJson(msg)}
526+
onClick={e => this.modifyJson(msg)}
527527
>
528528
Modify
529529
</button>
@@ -557,7 +557,7 @@ export class ASRouterAdminInner extends React.PureComponent {
557557
name={msg.id}
558558
className="general-textarea"
559559
disabled={isBlocked}
560-
onChange={() => this.handleChange(msg.id)}
560+
onChange={e => this.handleChange(msg.id)}
561561
>
562562
{JSON.stringify(msg, null, 2)}
563563
</textarea>
@@ -647,7 +647,7 @@ export class ASRouterAdminInner extends React.PureComponent {
647647
</button>
648648
<button
649649
className="ASRouterButton slim button"
650-
onClick={() => this.resetPBJSON(msg)}
650+
onClick={e => this.resetPBJSON(msg)}
651651
>
652652
Reset JSON
653653
</button>
@@ -698,7 +698,7 @@ export class ASRouterAdminInner extends React.PureComponent {
698698
<div>
699699
<button
700700
className="ASRouterButton slim"
701-
onClick={() => this.toggleAllMessages(messagesToShow)}
701+
onClick={e => this.toggleAllMessages(messagesToShow)}
702702
>
703703
Collapse/Expand All
704704
</button>
@@ -1046,7 +1046,7 @@ export class ASRouterAdminInner extends React.PureComponent {
10461046
});
10471047
}
10481048

1049-
setAttribution() {
1049+
setAttribution(e) {
10501050
ASRouterUtils.sendMessage({
10511051
type: "FORCE_ATTRIBUTION",
10521052
data: this.state.attributionParameters,
@@ -1307,7 +1307,7 @@ export class ASRouterAdminInner extends React.PureComponent {
13071307
<h2>Messages</h2>
13081308
<button
13091309
className="ASRouterButton slim button"
1310-
onClick={() => this.toggleAllMessages(messagesToShow)}
1310+
onClick={e => this.toggleAllMessages(messagesToShow)}
13111311
>
13121312
Collapse/Expand All
13131313
</button>
@@ -1359,7 +1359,10 @@ export class ASRouterAdminInner extends React.PureComponent {
13591359
<tbody>
13601360
{this.state.groups &&
13611361
this.state.groups.map(
1362-
({ id, enabled, frequency, userPreferences = [] }) => (
1362+
(
1363+
{ id, enabled, frequency, userPreferences = [] },
1364+
index
1365+
) => (
13631366
<Row key={id}>
13641367
<td>
13651368
<TogglePrefCheckbox

browser/components/asrouter/content-src/components/ASRouterAdmin/CopyButton.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const CopyButton = ({
2626
timeout.current = setTimeout(() => setCopied(false), 1500);
2727
}, [inputSelector, transformer]);
2828
return (
29-
<button className={className} onClick={() => onClick()} {...props}>
29+
<button className={className} onClick={e => onClick()} {...props}>
3030
{(copied && copiedLabel) || label}
3131
</button>
3232
);

browser/components/asrouter/modules/ASRouter.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ export class _ASRouter {
947947
return this.state;
948948
}
949949

950-
async _onLocaleChanged() {
950+
async _onLocaleChanged(subject, topic, data) {
951951
await this._maybeUpdateL10nAttachment();
952952
}
953953

@@ -1743,7 +1743,7 @@ export class _ASRouter {
17431743
}
17441744
// Update storage
17451745
this._storage.set("groupImpressions", newGroupImpressions);
1746-
return this.setState(() => ({
1746+
return this.setState(({ groups }) => ({
17471747
groupImpressions: newGroupImpressions,
17481748
}));
17491749
}

browser/components/asrouter/modules/ASRouterTargeting.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ const TargetingGetters = {
576576
lazy.fxAccounts
577577
.getSignedInUser()
578578
.then(data => resolve(!!data))
579-
.catch(() => resolve(false));
579+
.catch(e => resolve(false));
580580
});
581581
},
582582
get sync() {

browser/components/asrouter/modules/ASRouterTriggerListeners.sys.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ export const ASRouterTriggerListeners = new Map([
446446
}
447447
},
448448

449-
observe(aSubject, aTopic) {
449+
observe(aSubject, aTopic, aData) {
450450
if (aSubject.currentURI.asciiHost === "accounts.firefox.com") {
451451
// Don't notify about saved logins on the FxA login origin since this
452452
// trigger is used to promote login Sync and getting a recommendation
@@ -562,7 +562,7 @@ export const ASRouterTriggerListeners = new Map([
562562
_sessionPageLoad: 0,
563563
onLocationChange: null,
564564

565-
init(triggerHandler, params) {
565+
init(triggerHandler, params, patterns) {
566566
params.forEach(p => this._events.push(p));
567567

568568
if (!this._initialized) {
@@ -610,7 +610,7 @@ export const ASRouterTriggerListeners = new Map([
610610
this._sessionPageLoad = 0;
611611
},
612612

613-
observe(aSubject, aTopic) {
613+
observe(aSubject, aTopic, aData) {
614614
switch (aTopic) {
615615
case "SiteProtection:ContentBlockingEvent":
616616
const { browser, host, event } = aSubject.wrappedJSObject;
@@ -690,7 +690,7 @@ export const ASRouterTriggerListeners = new Map([
690690
this._triggerHandler = triggerHandler;
691691
},
692692

693-
observe(aSubject, aTopic) {
693+
observe(aSubject, aTopic, aData) {
694694
switch (aTopic) {
695695
case "captive-portal-login-success":
696696
const browser = Services.wm.getMostRecentBrowserWindow();

browser/components/asrouter/modules/CFRPageActions.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ export class PageAction {
792792
* Respond to a user click on the recommendation by showing a doorhanger/
793793
* popup notification or running the action defined in the message
794794
*/
795-
async _cfrUrlbarButtonClick() {
795+
async _cfrUrlbarButtonClick(event) {
796796
const browser = this.window.gBrowser.selectedBrowser;
797797
if (!RecommendationMap.has(browser)) {
798798
// There's no recommendation for this browser, so the user shouldn't have

browser/components/asrouter/modules/FeatureCalloutBroker.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export class _FeatureCalloutBroker {
192192
return item;
193193
}
194194

195-
handleFeatureCalloutCallback(win, event) {
195+
handleFeatureCalloutCallback(win, event, data) {
196196
switch (event) {
197197
case "end":
198198
const item = this.#calloutMap.get(win);

browser/components/asrouter/modules/ToastNotification.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const ToastNotification = {
123123
}
124124

125125
let shownPromise = Promise.withResolvers();
126-
let obs = (subject, topic) => {
126+
let obs = (subject, topic, data) => {
127127
if (topic === "alertshow") {
128128
shownPromise.resolve();
129129
}

browser/components/asrouter/modules/ToolbarBadgeHub.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class _ToolbarBadgeHub {
8181
win.MozXULElement.insertFTLIfNeeded("browser/newtab/asrouter.ftl");
8282
}
8383

84-
executeAction({ id }) {
84+
executeAction({ id, data, message_id }) {
8585
switch (id) {
8686
case "show-whatsnew-button":
8787
lazy.ToolbarPanelHub.enableToolbarButton();

0 commit comments

Comments
 (0)