Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-07-04 07:02:08 +08:00
commit bd5506d13c
59 changed files with 1121 additions and 955 deletions

View file

@ -1740,13 +1740,15 @@
this._outerWindowIDBrowserMap.set(b.outerWindowID, b);
}
// Check if we're opening a tab related to the current tab and
// move it to after the current tab.
// aReferrerURI is null or undefined if the tab is opened from
// Check if the user prefers inserting all new tabs after the current tab.
// If not, check if we're opening a tab related to the current tab.
// If either condition is met, move the new tab to after the current tab.
// Note: aReferrerURI is null or undefined if the tab is opened from
// an external application or bookmark, i.e. somewhere other
// than the current tab.
if ((aRelatedToCurrent == null ? aReferrerURI : aRelatedToCurrent) &&
Services.prefs.getBoolPref("browser.tabs.insertRelatedAfterCurrent")) {
if (Services.prefs.getBoolPref("browser.tabs.insertAllAfterCurrent", false) ||
((aRelatedToCurrent == null ? aReferrerURI : aRelatedToCurrent) &&
Services.prefs.getBoolPref("browser.tabs.insertRelatedAfterCurrent"))) {
let newTabPos = (this._lastRelatedTab ||
this.selectedTab)._tPos + 1;
if (this._lastRelatedTab)