488669 - Port Bug 488238 [Blank about:sessionrestore] to SeaMonkey

Status: RESOLVED FIXED

(SeaMonkey :: Session Restore, defect)

Description

[Misak Khachatryan]

Attachment: ported patch

it doesn't make much sense to display about:sessionrestore when we don't
have data for any open windows at all.

Comment 1

[[e-mail]]

Comment on attachment 373080 [details] [diff] [review]
ported patch

>+    let winData = aState.windows || null;
>+    if (!winData || winData.length == 0)
>+      return false;
>+    
>     // don't wrap a single about:sessionrestore page
>-    let winData = aState.windows || null;
>-    if (winData && winData.length == 1 && winData[0].tabs &&
>+    if (winData.length == 1 && winData[0].tabs &&
>         winData[0].tabs.length == 1 && winData[0].tabs[0].entries &&
>         winData[0].tabs[0].entries.length == 1 &&
>         winData[0].tabs[0].entries[0].url == "about:sessionrestore")
Does this work if rewritten as:
if (!aState.windows || !aState.windows.length)
  return false;

let winData = aState.windows;
if (winData.length == 1 && winData[0].tabs &&

Comment 2

[Misak Khachatryan]

Attachment: as suggested

I don't have test for this case, but can't see any reason why not.

Comment 3

[Dão Gottwald [:dao]]

(In reply to comment #1)
> (From update of attachment 373080 [details] [diff] [review])
> >+    let winData = aState.windows || null;
> >+    if (!winData || winData.length == 0)
> >+      return false;
> >+    
> >     // don't wrap a single about:sessionrestore page
> >-    let winData = aState.windows || null;
> >-    if (winData && winData.length == 1 && winData[0].tabs &&
> >+    if (winData.length == 1 && winData[0].tabs &&
> >         winData[0].tabs.length == 1 && winData[0].tabs[0].entries &&
> >         winData[0].tabs[0].entries.length == 1 &&
> >         winData[0].tabs[0].entries[0].url == "about:sessionrestore")
> Does this work if rewritten as:
> if (!aState.windows || !aState.windows.length)
>   return false;
> 
> let winData = aState.windows;
> if (winData.length == 1 && winData[0].tabs &&

I don't see any benefit of doing it this way. "|| null" seems unnecessary in the original patch, though.

Comment 4

[[e-mail]]

Comment on attachment 373093 [details] [diff] [review]
as suggested

>+    if (winData.length == 1 && winData[0].tabs &&    
Nit: trailing spaces

[there were some on the previous patch too, so maybe they moved ;-) ]

Comment 5

[Misak Khachatryan]

Attachment: nits fixed, for checkin [Checkin: Comment 6]

carrying forward r+ sr+ from Neil.

Comment 6

[Serge Gautherie (:sgautherie)]

Comment on attachment 373101 [details] [diff] [review]
nits fixed, for checkin
[Checkin: Comment 6]


http://hg.mozilla.org/comm-central/rev/c6e7be2ab73d