Skip to content

Commit c4f2787

Browse files
authored
Merge pull request #1990 from floccusaddon/fix/chrome-main-folder-ids
fix(BrowserTree): Do not guess bookmark folders' ids
2 parents 5ee8a6c + 177617d commit c4f2787

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

src/lib/browser/BrowserTree.ts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
6060
let overrideTitle, isRoot, isToolbar
6161
if (node.parentId === this.absoluteRoot.id && !isVivaldiBrowser) {
6262
switch (node.id) {
63-
case '1': // Chrome
6463
case 'toolbar_____': // Firefox
6564
overrideTitle = BrowserTree.TITLE_BOOKMARKS_BAR
6665
isToolbar = true
6766
break
68-
case '2': // Chrome
6967
case 'unfiled_____': // Firefox
7068
overrideTitle = BrowserTree.TITLE_OTHER_BOOKMARKS
7169
break
@@ -364,19 +362,14 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
364362
static async getAbsoluteRootFolder() {
365363
if (!absoluteRoot) {
366364
try {
367-
// chromium
368-
absoluteRoot = (await browser.bookmarks.get('0'))[0]
365+
// firefox
366+
absoluteRoot = (await browser.bookmarks.get('root________'))[0]
369367
} catch (e) {
370-
try {
371-
// firefox
372-
absoluteRoot = (await browser.bookmarks.get('root________'))[0]
373-
} catch (e) {
374-
// any other browser
375-
absoluteRoot = (await browser.bookmarks.getTree())[0]
376-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
377-
// @ts-ignore
378-
delete absoluteRoot.children
379-
}
368+
// any other browser
369+
absoluteRoot = (await browser.bookmarks.getTree())[0]
370+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
371+
// @ts-ignore
372+
delete absoluteRoot.children
380373
}
381374
}
382375
return absoluteRoot

0 commit comments

Comments
 (0)