Martijn Wargers (dead) Assignee
	Description • 18 years ago

This changed with my patch for bug 317334, so this is a problem on 1.8.1 branch too.
There used to be 2 line breaks shown in the onbeforunload dialog, but with the check in of my patch for bug 317334, the dialog shows 4 line breaks.

I think this is easy to fix in:
http://lxr.mozilla.org/seamonkey/source/layout/base/nsDocumentViewer.cpp#1197

	Martijn Wargers (dead) Assignee
	Comment 2 • 18 years ago

This fixes it.
I'm kinda curious of what StringHead(event.text, len) should give. It doesn't seem to give any text at all. Is there a situation when it has any text?

	Johnny Stenback (:jst)
	Comment 3 • 18 years ago

Comment on attachment 246097 [details] [diff] [review]
patch

event.text gets set if the beforeunload event handler sets event.returnValue (or returns a string value, if regsitered with window.onbeforeunload).

r+sr=jst

	Martijn Wargers (dead) Assignee
	Comment 4 • 18 years ago

Comment on attachment 246097 [details] [diff] [review]
patch

Ah, thanks, in that case this patch is no good, because the message would get at the same line as the top message.

	Martijn Wargers (dead) Assignee
	Comment 6 • 18 years ago

So something like this?

	Johnny Stenback (:jst)
	Comment 7 • 18 years ago

Comment on attachment 246130 [details] [diff] [review]
patchv2

Sure, r+sr=jst

	Martijn Wargers (dead) Assignee
	Comment 8 • 18 years ago

Checking in nsDocumentViewer.cpp;
/cvsroot/mozilla/layout/base/nsDocumentViewer.cpp,v  <--  nsDocumentViewer.cpp
new revision: 1.499; previous revision: 1.498
done

Checked in on trunk.

	:Gavin Sharp [email: gavin@gavinsharp.com]
	Comment 9 • 18 years ago

Comment on attachment 246130 [details] [diff] [review]
patchv2

>Index: layout/base/nsDocumentViewer.cpp

>+      nsAutoString msg;
>+      if (len == 0) {
>+        msg = preMsg + StringHead(event.text, len) +
>+              NS_LITERAL_STRING("\n\n") + postMsg;

What's the point of including event.text if you know its length is 0?

	Martijn Wargers (dead) Assignee
	Comment 10 • 18 years ago

> What's the point of including event.text if you know its length is 0?

You're right, there is no point in that, that was an oversight of me.

	Martijn Wargers (dead) Assignee
	Comment 11 • 18 years ago

Checking in nsDocumentViewer.cpp;
/cvsroot/mozilla/layout/base/nsDocumentViewer.cpp,v  <--  nsDocumentViewer.cpp
new revision: 1.500; previous revision: 1.499
done

Checked the patch in from comment 10, thanks Gavin.