From 78749a99418434bbe18c9a1b73187c73d0ff4b90 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Mon, 3 Jun 2013 18:46:42 +0200
Subject: [PATCH] Bug 878824: check when edit controls are present, r=mconley

---
 browser/base/content/browser.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1b435477e13..939206bb0c8 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3354,14 +3354,13 @@ function updateEditUIVisibility()
   // The UI is visible if the Edit menu is opening or open, if the context menu
   // is open, or if the toolbar has been customized to include the Cut, Copy,
   // or Paste toolbar buttons.
-  // XXXgijs: this needs to be updated with the unified cut/copy/paste toolbarbutton
-  // once that is customizable! See bug 870901.
   gEditUIVisible = editMenuPopupState == "showing" ||
                    editMenuPopupState == "open" ||
                    contextMenuPopupState == "showing" ||
                    contextMenuPopupState == "open" ||
                    placesContextMenuPopupState == "showing" ||
-                   placesContextMenuPopupState == "open";
+                   placesContextMenuPopupState == "open" ||
+                   document.getElementById("edit-controls") ? true : false;
 
   // If UI is visible, update the edit commands' enabled state to reflect
   // whether or not they are actually enabled for the current focus/selection.