summaryrefslogtreecommitdiffstats
path: root/application/basilisk/components
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2019-08-12 23:41:30 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-08-12 23:41:30 +0200
commit7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0 (patch)
treeb70ecd9ca6cf5543cc655c94d7eedf8be6ae6c99 /application/basilisk/components
parent06a1dd2a2827ceb7d2e7248ca64e2524dc3c9440 (diff)
downloadUXP-7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0.tar
UXP-7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0.tar.gz
UXP-7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0.tar.lz
UXP-7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0.tar.xz
UXP-7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0.zip
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 #663.
Diffstat (limited to 'application/basilisk/components')
-rw-r--r--application/basilisk/components/places/content/controller.js6
-rw-r--r--application/basilisk/components/places/content/placesOverlay.xul4
2 files changed, 7 insertions, 3 deletions
diff --git a/application/basilisk/components/places/content/controller.js b/application/basilisk/components/places/content/controller.js
index ebdab60f4..931c8fac1 100644
--- a/application/basilisk/components/places/content/controller.js
+++ b/application/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/application/basilisk/components/places/content/placesOverlay.xul b/application/basilisk/components/places/content/placesOverlay.xul
index 512eb923e..2dbef0f04 100644
--- a/application/basilisk/components/places/content/placesOverlay.xul
+++ b/application/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"