зеркало из https://github.com/mozilla/pjs.git
bug 481090 - Session restore should not special-case closed windows on Mac, r=dietrich
This commit is contained in:
Родитель
e0e71a5e57
Коммит
8b8f58f112
|
@ -1497,12 +1497,15 @@ SessionStoreService.prototype = {
|
||||||
}
|
}
|
||||||
this._updateCookies(total);
|
this._updateCookies(total);
|
||||||
|
|
||||||
|
#ifndef XP_MACOSX
|
||||||
// if no non-popup browser window remains open, return the state of the last closed window(s)
|
// if no non-popup browser window remains open, return the state of the last closed window(s)
|
||||||
if (nonPopupCount == 0 && this._lastClosedWindows) {
|
if (nonPopupCount == 0 && this._lastClosedWindows) {
|
||||||
// prepend the last non-popup browser window, so that if the user loads more tabs
|
// prepend the last non-popup browser window, so that if the user loads more tabs
|
||||||
// at startup we don't accidentally add them to a popup window
|
// at startup we don't accidentally add them to a popup window
|
||||||
total = this._lastClosedWindows.concat(total);
|
total = this._lastClosedWindows.concat(total);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (activeWindow) {
|
if (activeWindow) {
|
||||||
this.activeWindowSSiCache = activeWindow.__SSi || "";
|
this.activeWindowSSiCache = activeWindow.__SSi || "";
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче