1572336 - Merge marionette.js into all.js

Status: RESOLVED FIXED

(Core :: Preferences: Backend, task)

Description

[Nicholas Nethercote [inactive]]

There's no good reason for this file to be separate from all.js, and the separation has caused confusion in the past (see bug 1554690).

Comment 2

[Nicholas Nethercote [inactive]]

Attachment: Bug 1572336 - Merge marionette.js into all.js. r=ato

Depends on D41145

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/5995a967c99b
Merge marionette.js into all.js. r=ato

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/aa7d58ca2f4b
Port bug 1572336 - Merge marionette.js prefs into all-thunderbird.js. rs=bustage-fix

Comment 5

[Jorg K (CEST = GMT+2)]

Rob, Samuel: can't you please check whether my bustage fix is right. Of course the file needed to be removed from package-manifest.in but I'm not sure we need those prefs. I guess we do.

Comment 6

[Nicholas Nethercote [inactive]]

My understanding is that Thunderbird uses all.js, and then overrides some prefs in thunderbird-all.js. So I don't think the additions to thunderbird-all.js are necessary; you've effectively just defined them twice.

Comment 7

[Jorg K (CEST = GMT+2)]

Damn, I didn't look properly, they went into modules/libpref/init/all.js, not browser/app/profile/firefox.js. Sigh, I'll pull them out again.

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/089cade441b7
Port bug 1572336 - Remove marionette prefs from all-thunderbird.js since they are in modules/libpref/init/all.js. rs=bustage-fix DONTBUILD

Comment 9

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/5995a967c99b