From 2c94bfe2143b5786cc3029ba5316224ee05fc5de Mon Sep 17 00:00:00 2001 From: Frank Yan Date: Wed, 19 Oct 2011 00:32:08 -0400 Subject: [PATCH 1/2] Bug 695482 - Open 'Search Google for ' in the foreground. r=gavin ui-r=limi --- browser/base/content/browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index bdac8a8d19de..14530716c36c 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -3430,6 +3430,7 @@ const BrowserSearch = { openLinkIn(submission.uri.spec, useNewTab ? "tab" : "current", { postData: submission.postData, + inBackground: false, relatedToCurrent: true }); }, From b1a6f239cf81da7f72c06c6ebd4869c3eabb3684 Mon Sep 17 00:00:00 2001 From: Javi Rueda Date: Wed, 19 Oct 2011 11:18:29 -0400 Subject: [PATCH 2/2] Bug 495511 - Remove All Cookies button is enabled when no cookies are present. r=jwein --- browser/components/preferences/cookies.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/components/preferences/cookies.js b/browser/components/preferences/cookies.js index 6f57ed1b21f5..9edf66146b59 100644 --- a/browser/components/preferences/cookies.js +++ b/browser/components/preferences/cookies.js @@ -89,6 +89,8 @@ var gCookiesWindow = { this.filter(); } + document.getElementById("removeAllCookies").disabled = this._view._rowCount == 0; + this._saveState(); }, @@ -117,6 +119,7 @@ var gCookiesWindow = { this._view._rowCount = 0; this._tree.treeBoxObject.rowCountChanged(0, -oldRowCount); this._view.selection.clearSelection(); + document.getElementById("removeAllCookies").disabled = true; } else if (aData == "reload") { // first, clear any existing entries @@ -207,7 +210,10 @@ var gCookiesWindow = { this._view._rowCount += rowCountImpact; this._tree.treeBoxObject.rowCountChanged(oldRowCount - 1, rowCountImpact); - document.getElementById("removeAllCookies").disabled = this._view._filtered; + if (this._view._rowCount > 0 && !this._view._filtered) + document.getElementById("removeAllCookies").disabled = false; + else + document.getElementById("removeAllCookies").disabled = true; }, _view: {