Closed
Bug 787306
Opened 12 years ago
Closed 12 years ago
Fix merge conflicts from bug 762230
Categories
(Firefox :: Sync, defect)
Firefox
Sync
Tracking
()
RESOLVED
FIXED
mozilla19
People
(Reporter: gps, Assigned: gps)
References
Details
Attachments
(1 file)
|
1.27 KB,
patch
|
rnewman
:
review+
|
Details | Diff | Splinter Review |
Update setup.js to not use the Engines singleton, which was removed in bug 785225.
Attachment #657132 -
Flags: review?(rnewman)
|
||
Comment 1•12 years ago
|
||
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•12 years ago
|
||
Assignee: nobody → gps
Status: NEW → ASSIGNED
Whiteboard: [fixed in services]
|
|
||
Comment 3•12 years ago
|
||
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Whiteboard: [fixed in services]
Target Milestone: --- → mozilla19
|
||
Updated•6 years ago
|
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.
Description
•