Bug 594131 - bookmarks opened from app tab should open in the foreground even if browser.tabs.loadBookmarksInBackground=true. r=dao a=b

This commit is contained in:
Sindre Dammann 2010-09-22 14:55:08 +02:00
Родитель e2920da9a9
Коммит 7ac6fea44f
3 изменённых файлов: 61 добавлений и 0 удалений

Просмотреть файл

@ -152,6 +152,7 @@ _BROWSER_FILES = \
browser_bug581947.js \ browser_bug581947.js \
browser_bug585830.js \ browser_bug585830.js \
browser_bug592338.js \ browser_bug592338.js \
browser_bug594131.js \
browser_bug595507.js \ browser_bug595507.js \
browser_bug596687.js \ browser_bug596687.js \
browser_contextSearchTabPosition.js \ browser_contextSearchTabPosition.js \

Просмотреть файл

@ -0,0 +1,58 @@
/* ***** 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 594131 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() {
let backgroundPref = "browser.tabs.loadBookmarksInBackground";
let newTab = gBrowser.addTab("http://example.com");
waitForExplicitFinish();
newTab.linkedBrowser.addEventListener("load", mainPart, true);
Services.prefs.setBoolPref(backgroundPref, true);
function mainPart() {
gBrowser.pinTab(newTab);
gBrowser.selectedTab = newTab;
openUILinkIn("http://example.org/", "current");
isnot(gBrowser.selectedTab, newTab, "shouldn't load in background");
if (Services.prefs.prefHasUserValue(backgroundPref))
Services.prefs.clearUserPref(backgroundPref);
gBrowser.removeTab(newTab);
gBrowser.removeTab(gBrowser.tabs[1]); // example.org tab
finish();
}
}

Просмотреть файл

@ -234,9 +234,11 @@ function openUILinkIn(url, where, aAllowThirdPartyFixup, aPostData, aReferrerURI
if (!uriObj.schemeIs("javascript") && if (!uriObj.schemeIs("javascript") &&
w.gBrowser.currentURI.host != uriObj.host) { w.gBrowser.currentURI.host != uriObj.host) {
where = "tab"; where = "tab";
loadInBackground = false;
} }
} catch (err) { } catch (err) {
where = "tab"; where = "tab";
loadInBackground = false;
} }
} }