From fe68fd519cf0b3b16eaa263c76fd49d32d10d08c Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Mon, 12 Aug 2019 23:41:30 +0200
Subject: [PATCH] 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.
---
 .../basilisk/components/places/content/controller.js        | 6 +++++-
 .../basilisk/components/places/content/placesOverlay.xul    | 4 ++--
 .../palemoon/components/places/content/controller.js        | 6 +++++-
 .../palemoon/components/places/content/placesOverlay.xul    | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/application/basilisk/components/places/content/controller.js b/application/basilisk/components/places/content/controller.js
index ebdab60f4c..931c8fac14 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 512eb923e3..2dbef0f049 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"
diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js
index d098271632..f4e272e2f3 100644
--- a/application/palemoon/components/places/content/controller.js
+++ b/application/palemoon/components/places/content/controller.js
@@ -444,7 +444,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/palemoon/components/places/content/placesOverlay.xul b/application/palemoon/components/places/content/placesOverlay.xul
index 745990a9c2..59115a57fb 100644
--- a/application/palemoon/components/places/content/placesOverlay.xul
+++ b/application/palemoon/components/places/content/placesOverlay.xul
@@ -203,7 +203,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;"
@@ -212,7 +212,7 @@
               selection="link|host"
               selectiontype="single"
               hideifprivatebrowsing="true"
-              forcehideselection="bookmark"/>
+              forcehideselection="bookmark|livemarkChild"/>
     <menuseparator id="placesContext_deleteSeparator"/>
     <menuitem id="placesContext_reload"
               command="placesCmd_reload"