Continue synchronisation of xpfe autocomplete with toolkit autocomplete

RESOLVED FIXED

Status

SeaMonkey
Autocomplete
RESOLVED FIXED
11 years ago
10 years ago

People

(Reporter: Philip Chee, Assigned: Philip Chee)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 4 obsolete attachments)

(Assignee)

Description

11 years ago
Created attachment 267876 [details] [diff] [review]
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.
Attachment #267876 - Flags: superreview?(neil)
(Assignee)

Comment 1

11 years ago
Created attachment 267877 [details] [diff] [review]
Correct Attachment.

Ooops wrong file attached.
Assignee: nobody → philip.chee
Attachment #267876 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #267876 - Flags: superreview?(neil)
(Assignee)

Updated

11 years ago
Attachment #267877 - Flags: superreview?(neil)

Comment 2

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

Comment 3

11 years ago
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

11 years ago
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.
Attachment #267877 - Flags: superreview?(neil) → superreview+
(Assignee)

Comment 5

11 years ago
Created attachment 267960 [details] [diff] [review]
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.
Attachment #267877 - Attachment is obsolete: true
(Assignee)

Updated

10 years ago
Whiteboard: [checkin requested]
Whiteboard: [checkin requested] → [checkin needed]
Keywords: checkin-needed
Whiteboard: [checkin needed]

Comment 6

10 years ago
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?

Updated

10 years ago
Whiteboard: need updated patch
(Assignee)

Comment 7

10 years ago
Created attachment 272402 [details] [diff] [review]
 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...
Attachment #267960 - Attachment is obsolete: true
(Assignee)

Updated

10 years ago
Whiteboard: need updated patch

Comment 8

10 years ago
> > 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.
(Assignee)

Comment 9

10 years ago
Created attachment 272600 [details] [diff] [review]
Patch v2.2 from the top.

> You do that by running cvs diff from the mozilla/ directory.
Like this?
Attachment #272402 - Attachment is obsolete: true

Comment 10

10 years ago
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

10 years ago
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
Status: ASSIGNED → RESOLVED
Last Resolved: 10 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
(Assignee)

Comment 12

10 years ago
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.
(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|.
You need to log in before you can comment on or make changes to this bug.