Fix merge conflicts from bug 762230

RESOLVED FIXED in mozilla19

Status

()

RESOLVED FIXED
6 years ago
3 months ago

People

(Reporter: gps, Assigned: gps)

Tracking

unspecified
mozilla19
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

6 years ago
Created attachment 657132 [details] [diff] [review]
Unbitrot, v1

Update setup.js to not use the Engines singleton, which was removed in bug 785225.
Attachment #657132 - Flags: review?(rnewman)
Comment on attachment 657132 [details] [diff] [review]
Unbitrot, v1

Review of attachment 657132 [details] [diff] [review]:
-----------------------------------------------------------------

Should be fine after the obvious typo. Do test it before you land ;)

::: browser/base/content/sync/setup.js
@@ +929,5 @@
>          if (!Weave.Service.engineManager.get("prefs").enabled) {
>            document.getElementById("prefsWipe").hidden = true;
>          }
>  
> +        let addonsEngine = Weave.Service.enginerManager.get("addons");

Typo: enginer -> engine.
Attachment #657132 - Flags: review?(rnewman) → review+
(Assignee)

Comment 2

6 years ago
https://hg.mozilla.org/services/services-central/rev/435e2bd35477
Assignee: nobody → gps
Status: NEW → ASSIGNED
Whiteboard: [fixed in services]
https://hg.mozilla.org/mozilla-central/rev/435e2bd35477
Status: ASSIGNED → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED
Whiteboard: [fixed in services]
Target Milestone: --- → mozilla19
Component: Firefox Sync: Backend → Sync
Product: Cloud Services → Firefox
You need to log in before you can comment on or make changes to this bug.