Skip to content
Snippets Groups Projects
Commit 39a3cb81 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 42438: Tweaks to the migration wizard.

Remove the items not compatible with our features (such as history) from
the migration wizard.

On Linux, allow to specify an alternative home directory, since we
usually change $HOME in our startup script.
parent b9909d3b
No related branches found
No related tags found
1 merge request!1265Bug 43230: 115.17.0esr rebase
......@@ -317,7 +317,10 @@ export var ChromeMigrationUtils = {
for (let subfolders of options) {
let rootDir = subfolders[0];
try {
let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path;
let targetPath =
rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME")
? Services.env.get("BB_ORIGINAL_HOME")
: Services.dirsvc.get(rootDir, Ci.nsIFile).path;
targetPath = PathUtils.join(targetPath, ...subfolders.slice(1));
if (await IOUtils.exists(targetPath)) {
return targetPath;
......
......@@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement {
}
let key = panelItem.getAttribute("key");
let resourceTypes = panelItem.resourceTypes;
const allowedTypes = ["BOOKMARKS"];
let resourceTypes = panelItem.resourceTypes.filter(t =>
allowedTypes.includes(t)
);
for (let child of this.#resourceTypeList.querySelectorAll(
"label[data-resource-type]"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment