383936 - Continue synchronisation of xpfe autocomplete with toolkit autocomplete

Status: RESOLVED FIXED

(SeaMonkey :: Autocomplete, defect)

Description

[Philip Chee]

Attachment: support for <hbox> children

I'm porting a Firefox extension to SeaMonkey which uses this construct:

<textbox type="autocomplete"><hbox><image/></hbox></textbox>

This works fine in Firefox but makes SeaMonkey's autocomplete.xml unhappy and non functional. This patch adds the toolkit versions support for hbox; and tidies up the anonids in the locality somewhat.

Comment 1

[Philip Chee]

Attachment: Correct Attachment.

Ooops wrong file attached.

Comment 2

[Robert Kaiser]

hah, so we now have a second bug for syncing xpfe autocomplete with toolkit's in addition to bug 304309? :P

Comment 3

[Philip Chee]

I thought of attaching this patch to bug 304309 but that one appears focused on the wallet to satchel conversion and had stuff not related to autocomplete.xml.

Comment 4

[[e-mail]]

Comment on attachment 267877 [details] [diff] [review]
Correct Attachment.

sr=me except for the changes below:

>-      <xul:dropmarker class="autocomplete-history-dropmarker" allowevents="true"
>-                      xbl:inherits="open,hidden=disablehistory" anonid="historydropmarker"/>
>+      <xul:dropmarker anonid="historydropmarker" class="autocomplete-history-dropmarker"
>+                      allowevents="true"
>+                      xbl:inherits="open,hidden=disablehistory"/>
This doesn't change anything, does it?

>-      <xul:popupset>
>+      <xul:popupset anonid="popupset">
This is hardly worth your trouble. We might find we need it again.

Comment 5

[Philip Chee]

Attachment: Patch v2.0 (Nits Fixed)

(In reply to comment 4)
>>+      <xul:dropmarker anonid="historydropmarker" class="autocomplete-history-dropmarker"
>>+                      allowevents="true"
>>+                      xbl:inherits="open,hidden=disablehistory"/>
>This doesn't change anything, does it?
I just thought to sync the formatting to toolkit.

>>-      <xul:popupset>
>>+      <xul:popupset anonid="popupset">
>This is hardly worth your trouble. We might find we need it again.
Sorry, need /what/ again?

Anyway this patch fixes Neils nits. Plus I've removed some trailing whitespace I spotted. Not too sure how to carry forward the sr+ though.

Comment 6

[Kenneth Herron]

Patch v2.0 doesn't apply to the current tree. Philip, could you update it? Also, could you make the patch from the top-level "mozilla" directory?

Comment 7

[Philip Chee]

Attachment: Patch v2.1 (un-bitrotted)

> could you make the patch from the top-level "mozilla" directory?
How do I do that? This patch is generated by cvs diff -u -8p...

Comment 8

[Nickolay_Ponomarev]

> > could you make the patch from the top-level "mozilla" directory?
> How do I do that? This patch is generated by cvs diff -u -8p...

You do that by running cvs diff from the mozilla/ directory.

Comment 9

[Philip Chee]

Attachment: Patch v2.2 from the top.

> You do that by running cvs diff from the mozilla/ directory.
Like this?

Comment 10

[Nickolay_Ponomarev]

Yes, thank you. I didn't have a chance to check this in, but if no-one beats me to it, I should be able to do it tonight or tomorrow.

Comment 11

[Nickolay_Ponomarev]

Except it ended up having just the leaf names in the "---" and "+++" lines. Did you actually run cvs diff from the mozilla/ dir or just edited the patch?

Checking in xpfe/components/autocomplete/resources/content/autocomplete.xml;
/cvsroot/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml,v  <--  autocomplete.xml
new revision: 1.149; previous revision: 1.148
done

Comment 12

[Philip Chee]

Ooops sorry. I kept getting a cvs aborted message when I ran cvs diff from the mozilla dir so I just edited the patch directly. Perhaps I should just nuke everything and check it out again.

Comment 13

[:Gavin Sharp [email: [e-mail]]]

(In reply to comment #12)
> Ooops sorry. I kept getting a cvs aborted message when I ran cvs diff from the
> mozilla dir

That's likely to happen if you're trying to do a full tree diff. Are you specifying the files/directories to diff? E.g. |cvs diff -up8 xpfe/components/autocomplete/resources/content|.

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/13e6e2cbb2eb
Continue synchronisation of xpfe autocomplete with toolkit autocomplete