зеркало из https://github.com/mozilla/gecko-dev.git
Bug 346447: loadFolderAndReplace=false ignores "loading" tabs, patch by Pablo Greco <pablo@fliagreco.com.ar>, r=mano
This commit is contained in:
Родитель
d59fc6db36
Коммит
db839a9b4a
|
@ -799,9 +799,12 @@ var BookmarksCommand = {
|
||||||
if (doReplace)
|
if (doReplace)
|
||||||
index0 = 0;
|
index0 = 0;
|
||||||
else {
|
else {
|
||||||
for (index0=tabCount-1; index0>=0; --index0)
|
for (index0=tabCount-1; index0>=0; --index0) {
|
||||||
if (tabPanels[index0].webNavigation.currentURI.spec != "about:blank")
|
var tab = tabPanels[index0];
|
||||||
|
if (tab.webNavigation.currentURI.spec != "about:blank" ||
|
||||||
|
tab.webProgress.isLoadingDocument)
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
++index0;
|
++index0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1386,9 +1386,12 @@ var PlacesController = {
|
||||||
firstIndex = 0;
|
firstIndex = 0;
|
||||||
// If the pref is not set, only load over the blank tabs at the end, if any.
|
// If the pref is not set, only load over the blank tabs at the end, if any.
|
||||||
else {
|
else {
|
||||||
for (firstIndex = tabCount - 1; firstIndex >= 0; --firstIndex)
|
for (firstIndex = tabCount - 1; firstIndex >= 0; --firstIndex) {
|
||||||
if (browser.browsers[firstIndex].currentURI.spec != "about:blank")
|
var br = browser.browsers[firstIndex];
|
||||||
|
if (br.currentURI.spec != "about:blank" ||
|
||||||
|
br.webProgress.isLoadingDocument)
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
++firstIndex;
|
++firstIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче