diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2019-08-12 23:41:30 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-12 23:41:30 +0200 |
| commit | cb3108c620009f6591259e3597de5e7e0205b18d (patch) | |
| tree | 1da3dc00de60a3aa80b3a84927b71d308f3a0bdf | |
| parent | 60dc7c3e63df941402099ad9cd34d2e5f4719914 (diff) | |
| download | basilisk-cb3108c620009f6591259e3597de5e7e0205b18d.tar.gz | |
Remove "Delete this page" and "Forget about this site" from livemarks.
These context menu entries should not be present on live bookmarks
because they make no sense for feed entries.
This resolves MoonchildProductions/UXP#663.
| -rw-r--r-- | basilisk/components/places/content/controller.js | 6 | ||||
| -rw-r--r-- | basilisk/components/places/content/placesOverlay.xul | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/basilisk/components/places/content/controller.js b/basilisk/components/places/content/controller.js index ebdab60..931c8fa 100644 --- a/basilisk/components/places/content/controller.js +++ b/basilisk/components/places/content/controller.js @@ -461,7 +461,11 @@ PlacesController.prototype = { if (parentNode) { if (PlacesUtils.nodeIsTagQuery(parentNode)) nodeData["tagChild"] = true; - else if (this.hasCachedLivemarkInfo(parentNode)) + } + } else { + var parentNode = node.parent; + if (parentNode) { + if (this.hasCachedLivemarkInfo(parentNode)) nodeData["livemarkChild"] = true; } } diff --git a/basilisk/components/places/content/placesOverlay.xul b/basilisk/components/places/content/placesOverlay.xul index 512eb92..2dbef0f 100644 --- a/basilisk/components/places/content/placesOverlay.xul +++ b/basilisk/components/places/content/placesOverlay.xul @@ -198,7 +198,7 @@ accesskey="&cmd.delete.accesskey;" closemenu="single" selection="link" - forcehideselection="bookmark"/> + forcehideselection="bookmark|livemarkChild"/> <menuitem id="placesContext_deleteHost" command="placesCmd_deleteDataHost" label="&cmd.deleteDomainData.label;" @@ -207,7 +207,7 @@ selection="link|host" selectiontype="single" hideifprivatebrowsing="true" - forcehideselection="bookmark"/> + forcehideselection="bookmark|livemarkChild"/> <menuseparator id="placesContext_deleteSeparator"/> <menuitem id="placesContext_sortBy:name" command="placesCmd_sortBy:name" |