405653 - Synchronize /suite and /toolkit <contentAreaUtils.js>

Status: RESOLVED FIXED

(SeaMonkey :: General, defect)

Description

[Serge Gautherie (:sgautherie)]

Comment 1

[Serge Gautherie (:sgautherie)]

Attachment: (Av1-TK) whitespace/++ cleanup

Whitespaces, comments and 1 code rewrite: no functional change.

Comment 2

[Serge Gautherie (:sgautherie)]

Attachment: (Bv1-SM) whitespace cleanup and simple code sync

Simple TK->SM code sync...

Comment 3

[[e-mail]]

Comment on attachment 290402 [details] [diff] [review]
(Bv1-SM) whitespace cleanup and simple code sync

>-function isContentFrame(aFocusedWindow)
>+function isContentFrame(aFocusedWindow)
I don't think it's worth moving entire functions around.

>+const kSaveAsType_Complete = 0; // Save document with attached objects.
>+// const kSaveAsType_URL      = 1; // Save document or URL by itself.
>+const kSaveAsType_Text     = 2; // Save document, converting to plain text. 
These should go where the old consts were. You've also got a trailing space.

>     contentType : (!aChosenData && useSaveDocument &&
>-                   saveAsType == SAVETYPE_TEXT_ONLY) ?
>-                  "text/plain" : null,
>+                   saveAsType == kSaveAsType_Text) ?
>+                   "text/plain" : null,
The second change is wrong - saveAsType lines up with ! but " with (.

Comment 4

[Serge Gautherie (:sgautherie)]

(In reply to comment #3)
> I don't think it's worth moving entire functions around.

It helps (me) when doing a diff between the files, but as you want.

> These should go where the old consts were. You've also got a trailing space.

All right. Missed that space.

> The second change is wrong - saveAsType lines up with ! but " with (.

Right, I didn't pay enough attention to this one.

Comment 5

[Serge Gautherie (:sgautherie)]

Attachment: (Av1a-TK) whitespace/++ cleanup [Checkin: Comment 12]

Av1-TK, with comment 3 update,
and better documentation.

Comment 6

[Serge Gautherie (:sgautherie)]

Attachment: (Bv2-SM) whitespace cleanup and simple code sync [Checkin: Comment 7]

Bv1-SM, with comment 3 update.

Comment 7

[Reed Loden [:reed]]

Bv2-SM:

Checking in suite/common/contentAreaUtils.js;
/cvsroot/mozilla/suite/common/contentAreaUtils.js,v  <--  contentAreaUtils.js
new revision: 1.150; previous revision: 1.149
done

Comment 8

[Asaf Romano (gone)]

Comment on attachment 290596 [details] [diff] [review]
(Av1a-TK) whitespace/++ cleanup [Checkin: Comment 12]

r=mano

Comment 9

[Serge Gautherie (:sgautherie)]

Comment on attachment 290596 [details] [diff] [review]
(Av1a-TK) whitespace/++ cleanup [Checkin: Comment 12]

"approvalM10=?":
No code change, sync' only;
not mandatory, yet no need to wait either.

Comment 10

[Reed Loden [:reed]]

Comment on attachment 290596 [details] [diff] [review]
(Av1a-TK) whitespace/++ cleanup [Checkin: Comment 12]

No need to get this in for M10... just request approval1.9 for landing after beta.

Comment 11

[Mike Schroepfer]

Comment on attachment 290596 [details] [diff] [review]
(Av1a-TK) whitespace/++ cleanup [Checkin: Comment 12]

Can you land this *after* the tree re-opens from Beta2?

Comment 12

[Reed Loden [:reed]]

Checking in toolkit/content/contentAreaUtils.js;
/cvsroot/mozilla/toolkit/content/contentAreaUtils.js,v  <--  contentAreaUtils.js
new revision: 1.100; previous revision: 1.99
done