Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

"Other Bookmarks" folder no longer shows delete in context menu #4857

Merged
merged 1 commit into from
Oct 17, 2016
Merged

"Other Bookmarks" folder no longer shows delete in context menu #4857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions js/contextMenus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function siteDetailTemplateInit (siteDetail, activeFrame) {
let isHistoryEntry = false
let isHistoryEntries = false
let isFolder = false
let isRootFolder = false
let isSystemFolder = false
let deleteLabel
let deleteTag

Expand All @@ -226,7 +226,8 @@ function siteDetailTemplateInit (siteDetail, activeFrame) {
deleteTag = siteTags.BOOKMARK
} else if (siteUtil.isFolder(siteDetail)) {
isFolder = true
isRootFolder = siteDetail.get('folderId') === 0
isSystemFolder = siteDetail.get('folderId') === 0 ||
siteDetail.get('folderId') === -1
deleteLabel = 'deleteFolder'
deleteTag = siteTags.BOOKMARK_FOLDER
} else if (siteUtil.isHistoryEntry(siteDetail)) {
Expand Down Expand Up @@ -271,7 +272,7 @@ function siteDetailTemplateInit (siteDetail, activeFrame) {
CommonMenu.separatorMenuItem)
}

if (!isRootFolder) {
if (!isSystemFolder) {
// History can be deleted but not edited
// Picking this menu item pops up the AddEditBookmark modal
if (!isHistoryEntry && !isHistoryEntries) {
Expand Down