Bug 581242 - about:addons should open in the current tab if that tab is blank. r=dao

This commit is contained in:
Sindre Dammann 2010-08-05 09:11:25 +02:00
parent e8ac3c378b
commit 2981cc9442
3 changed files with 57 additions and 1 deletions

View File

@ -7771,7 +7771,10 @@ function switchToTabHavingURI(aURI, aOpenNew, aCallback) {
// No opened tab has that url.
if (aOpenNew) {
gBrowser.selectedTab = gBrowser.addTab(aURI.spec);
if (isTabEmpty(gBrowser.selectedTab))
gBrowser.selectedBrowser.loadURI(aURI.spec);
else
gBrowser.selectedTab = gBrowser.addTab(aURI.spec);
if (aCallback) {
let browser = gBrowser.selectedBrowser;
browser.addEventListener("pageshow", function(event) {

View File

@ -138,6 +138,7 @@ _BROWSER_FILES = \
browser_bug563588.js \
browser_bug577121.js \
browser_bug580956.js \
browser_bug581242.js \
browser_contextSearchTabPosition.js \
browser_ctrlTab.js \
browser_discovery.js \

View File

@ -0,0 +1,52 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is bug 581242 test.
*
* The Initial Developer of the Original Code is
* Sindre Dammann <sindrebugzilla@gmail.com>
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
function test() {
// Create a new tab and load about:addons
let blanktab = gBrowser.addTab();
gBrowser.selectedTab = blanktab;
BrowserOpenAddonsMgr();
is(blanktab, gBrowser.selectedTab, "Current tab should be blank tab");
// Verify that about:addons loads
waitForExplicitFinish();
gBrowser.selectedBrowser.addEventListener("load", function() {
let browser = blanktab.linkedBrowser;
is(browser.currentURI.spec, "about:addons", "about:addons should load into blank tab.");
gBrowser.removeTab(blanktab);
finish();
}, true);
}