Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting the fix for bug 343871 due to regressions.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@208308 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dietrich%mozilla.com
2006-08-24 17:58:28 +00:00
parent 6227d7f079
commit a509be7921
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/browser/components/sessionstore/src/nsSessionStore.js
View File

@@ -387,9 +387,8 @@ SessionStoreService.prototype = {
onLoad: function sss_onLoad(aWindow) {
var _this = this;
// ignore non-browser windows and windows opened while shutting down
if (aWindow.document.documentElement.getAttribute("windowtype") != "navigator:browser" ||
this._loadState == STATE_QUITTING)
// ignore non-browser windows
if (aWindow.document.documentElement.getAttribute("windowtype") != "navigator:browser")
return;
// assign it a unique identifier (timestamp)
@@ -442,8 +441,7 @@ SessionStoreService.prototype = {
* Window reference
*/
onClose: function sss_onClose(aWindow) {
// ignore windows not tracked by SessionStore
if (!aWindow.__SSi || !this._windows[aWindow.__SSi]) {
if (aWindow.document.documentElement.getAttribute("windowtype") != "navigator:browser") {
return;
}
@@ -1183,17 +1181,12 @@ SessionStoreService.prototype = {
return;
}
var winData;
// open new windows for all further window entries of a multi-window session
// (unless they don't contain any tab data)
for (var w = 1; w < root.windows.length; w++) {
winData = root.windows[w];
if (winData && winData.tabs && winData.tabs[0]) {
this._openWindowWithState({ windows: [winData], opener: aWindow });
}
this._openWindowWithState({ windows: [root.windows[w]], opener: aWindow });
}
winData = root.windows[0];
var winData = root.windows[0];
if (!winData.tabs) {
winData.tabs = [];
}