зеркало из https://github.com/mozilla/pjs.git
Back out all of dgottwald's push from Wed Aug 11 05:04:25 2010 PDT because the tree is in a state of chaos and the push was obviously against tree rules.
This commit is contained in:
Benjamin Smedberg
Родитель
65973ca235
Коммит
7274f7f20b
|
|
@ -1016,8 +1016,7 @@
|
||||||
// == 1 false YES
|
// == 1 false YES
|
||||||
// == 1 true NO
|
// == 1 true NO
|
||||||
// > 1 false/true NO
|
// > 1 false/true NO
|
||||||
var multiple = aURIs.length > 1;
|
var owner = (aURIs.length > 1) || aLoadInBackground ? null : this.selectedTab;
|
||||||
var owner = multiple || aLoadInBackground ? null : this.selectedTab;
|
|
||||||
var firstTabAdded = null;
|
var firstTabAdded = null;
|
||||||
|
|
||||||
if (aReplace) {
|
if (aReplace) {
|
||||||
|
|
@ -1029,7 +1028,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
firstTabAdded = this.addTab(aURIs[0], {ownerTab: owner, skipAnimation: multiple});
|
firstTabAdded = this.addTab(aURIs[0], {ownerTab: owner, skipAnimation: true});
|
||||||
|
|
||||||
var tabNum = this.tabContainer.selectedIndex;
|
var tabNum = this.tabContainer.selectedIndex;
|
||||||
for (let i = 1; i < aURIs.length; ++i) {
|
for (let i = 1; i < aURIs.length; ++i) {
|
||||||
|
|
@ -1324,19 +1323,10 @@
|
||||||
<parameter name="aParams"/>
|
<parameter name="aParams"/>
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
|
var isLastTab = (this.tabs.length - this._removingTabs.length == 1);
|
||||||
if (aParams)
|
if (aParams)
|
||||||
var animate = aParams.animate;
|
var animate = aParams.animate;
|
||||||
|
|
||||||
// Handle requests for synchronously removing an already
|
|
||||||
// asynchronously closing tab.
|
|
||||||
if (!animate &&
|
|
||||||
this._removingTabs.indexOf(aTab) > -1) {
|
|
||||||
this._endRemoveTab(aTab);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var isLastTab = (this.tabs.length - this._removingTabs.length == 1);
|
|
||||||
|
|
||||||
if (!this._beginRemoveTab(aTab, false, null, true))
|
if (!this._beginRemoveTab(aTab, false, null, true))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -2414,7 +2404,7 @@
|
||||||
var tabs = document.getBindingParent(this);
|
var tabs = document.getBindingParent(this);
|
||||||
tabs.removeAttribute("overflow");
|
tabs.removeAttribute("overflow");
|
||||||
|
|
||||||
tabs.tabbrowser._removingTabs.forEach(tabs.tabbrowser.removeTab,
|
tabs.tabbrowser._removingTabs.forEach(tabs.tabbrowser._endRemoveTab,
|
||||||
tabs.tabbrowser);
|
tabs.tabbrowser);
|
||||||
|
|
||||||
tabs._positionPinnedTabs();
|
tabs._positionPinnedTabs();
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,6 @@ function test() {
|
||||||
gBrowser.removeTab(tab);
|
gBrowser.removeTab(tab);
|
||||||
is(tab.parentNode, null, "tab removed immediately");
|
is(tab.parentNode, null, "tab removed immediately");
|
||||||
|
|
||||||
tab = gBrowser.addTab("about:blank", { skipAnimation: true });
|
|
||||||
gBrowser.removeTab(tab, { animate: true });
|
|
||||||
gBrowser.removeTab(tab);
|
|
||||||
is(tab.parentNode, null, "tab removed immediately when calling removeTab again after the animation was kicked off");
|
|
||||||
|
|
||||||
waitForExplicitFinish();
|
waitForExplicitFinish();
|
||||||
|
|
||||||
Services.prefs.setBoolPref("browser.tabs.animate", true);
|
Services.prefs.setBoolPref("browser.tabs.animate", true);
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,11 @@
|
||||||
|
|
||||||
#navigator-toolbox {
|
#navigator-toolbox {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
background-color: transparent;
|
|
||||||
border-top: none;
|
border-top: none;
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
#navigator-toolbox[tabsontop="true"] {
|
||||||
border-bottom: 1px solid ThreeDShadow;
|
border-bottom: 1px solid ThreeDShadow;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -78,11 +81,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar:not(:-moz-lwtheme),
|
#nav-bar:not(:-moz-lwtheme),
|
||||||
#nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
|
#navigator-toolbox[tabsontop="true"] > #nav-bar {
|
||||||
#nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
|
|
||||||
#navigator-toolbox[tabsontop="true"] > #nav-bar,
|
|
||||||
#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar,
|
|
||||||
#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar {
|
|
||||||
background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
|
background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1116,6 +1115,10 @@ richlistitem[type="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-i
|
||||||
-moz-box-shadow: 0 -1px ThreeDShadow inset;
|
-moz-box-shadow: 0 -1px ThreeDShadow inset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#TabsToolbar[tabsontop="false"] {
|
||||||
|
border-bottom: 1px solid ThreeDShadow !important;
|
||||||
|
}
|
||||||
|
|
||||||
.tabbrowser-tabs:-moz-system-metric(touch-enabled) {
|
.tabbrowser-tabs:-moz-system-metric(touch-enabled) {
|
||||||
min-height: .73cm;
|
min-height: .73cm;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,10 @@ Tester.prototype = {
|
||||||
let msg = baseMsg.replace("{elt}", "tab") +
|
let msg = baseMsg.replace("{elt}", "tab") +
|
||||||
": " + lastTab.linkedBrowser.currentURI.spec;
|
": " + lastTab.linkedBrowser.currentURI.spec;
|
||||||
this.currentTest.addResult(new testResult(false, msg, "", false));
|
this.currentTest.addResult(new testResult(false, msg, "", false));
|
||||||
|
if (gBrowser._removingTabs && gBrowser._removingTabs.indexOf(lastTab) > -1) {
|
||||||
|
gBrowser._endRemoveTab(lastTab);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
gBrowser.removeTab(lastTab);
|
gBrowser.removeTab(lastTab);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче