From e5f99bf365ad83e55a206d7766c6d8b0a3b473ff Mon Sep 17 00:00:00 2001 From: "mozilla.mano@sent.com" Date: Fri, 4 Apr 2008 11:01:15 -0700 Subject: [PATCH] Disable the delete menuitem when no places node is explicitly selected. r=dietrich. --- browser/components/places/content/menu.xml | 8 +++++++- browser/components/places/content/toolbar.xml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/browser/components/places/content/menu.xml b/browser/components/places/content/menu.xml index 0bde98fa744b..3804a388109d 100755 --- a/browser/components/places/content/menu.xml +++ b/browser/components/places/content/menu.xml @@ -931,7 +931,13 @@ this._ensureInitialized(); this._contextMenuShown = true; this.focus(); - return this.controller.buildContextMenu(aPopup); + var show = this.controller.buildContextMenu(aPopup); + if (show) { + // disable the Delete command if the selection isn't explicit + if (document.popupNode && document.popupNode.localName == "menupopup") + document.getElementById("cmd_delete").setAttribute("disabled", "true"); + } + return false; ]]> diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml index 43a6d6367caf..db7c4ecb4d0e 100755 --- a/browser/components/places/content/toolbar.xml +++ b/browser/components/places/content/toolbar.xml @@ -947,7 +947,13 @@