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 | 7dfb0c2168fd6f04e3c2eccbd5f589baa9d0b0e0 (patch) | |
| tree | b70ecd9ca6cf5543cc655c94d7eedf8be6ae6c99 /application | |
| parent | 06a1dd2a2827ceb7d2e7248ca64e2524dc3c9440 (diff) | |
| download | UXP-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')
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 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" diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js index d09827163..f4e272e2f 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 745990a9c..59115a57f 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" |