Skip to content

Commit 6363cad

Browse files
bgrinsbgrins
committed
Bug 1417119 - Remove xpfe autocomplete binding;r=iann_bugzilla+23131,Paolo
MozReview-Commit-ID: 6oDDVFetEBT --HG-- extra : rebase_source : 7dbdd41a968e8cf711d9a639b28b9bc367121c13
1 parent 30a99a2 commit 6363cad

File tree

9 files changed

+28
-1886
lines changed

9 files changed

+28
-1886
lines changed

‎accessible/tests/mochitest/tree/test_combobox.xul

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -123,43 +123,6 @@
123123
]
124124
};
125125
126-
// XPFE and Toolkit autocomplete widgets differ.
127-
var ac1h = document.getElementById("autocomplete");
128-
if ("clearResults" in ac1h) {
129-
SimpleTest.ok(true, "Testing (Old) XPFE autocomplete widget. (ac1h)");
130-
131-
// Popup is always created.
132-
accTree.children.push(
133-
{
134-
// xul:panel
135-
role: ROLE_COMBOBOX_LIST,
136-
children: [
137-
{
138-
// xul:tree
139-
role: ROLE_TABLE,
140-
children: [
141-
{
142-
// xul:treecols
143-
role: ROLE_LIST,
144-
children: [
145-
{
146-
// xul:treecol
147-
role: ROLE_COLUMNHEADER,
148-
children: []
149-
}
150-
]
151-
}
152-
]
153-
}
154-
]
155-
}
156-
);
157-
} else {
158-
SimpleTest.ok(true, "Testing (New) Toolkit autocomplete widget. (ac1h)");
159-
160-
// Popup is lazily created, so not present in this case.
161-
}
162-
163126
testAccessibleTree("autocomplete", accTree);
164127
165128
//////////////////////////////////////////////////////////////////////////
@@ -195,43 +158,6 @@
195158
]
196159
};
197160
198-
// XPFE and Toolkit autocomplete widgets differ.
199-
var ac2cmp = document.getElementById("autocomplete2");
200-
if ("clearResults" in ac2cmp) {
201-
SimpleTest.ok(true, "Testing (Old) XPFE autocomplete widget. (ac2mp)");
202-
203-
// Popup is always created.
204-
accTree.children.push(
205-
{
206-
// xul:panel
207-
role: ROLE_COMBOBOX_LIST,
208-
children: [
209-
{
210-
// xul:tree
211-
role: ROLE_TABLE,
212-
children: [
213-
{
214-
// xul:treecols
215-
role: ROLE_LIST,
216-
children: [
217-
{
218-
// xul:treecol
219-
role: ROLE_COLUMNHEADER,
220-
children: []
221-
}
222-
]
223-
}
224-
]
225-
}
226-
]
227-
}
228-
);
229-
} else {
230-
SimpleTest.ok(true, "Testing (New) Toolkit autocomplete widget. (ac2mp)");
231-
232-
// Popup is lazily created, so not present in this case.
233-
}
234-
235161
testAccessibleTree("autocomplete2", accTree);
236162
237163
SimpleTest.finish()

‎accessible/tests/mochitest/tree/test_txtctrl.xul

Lines changed: 23 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -125,65 +125,30 @@
125125
SimpleTest.finish();
126126
}
127127
128-
// XPFE and Toolkit autocomplete widgets differ.
129128
var txc = document.getElementById("txc_autocomplete");
130-
if ("clearResults" in txc) {
131-
SimpleTest.ok(true, "Testing (Old) XPFE autocomplete widget.");
132-
133-
// Popup is always created. (See code below.)
134-
135-
accTree.children.push(
136-
{
137-
// xul:panel
138-
role: ROLE_COMBOBOX_LIST,
139-
children: [
140-
{
141-
// xul:tree
142-
role: ROLE_TABLE,
143-
children: [
144-
{
145-
// xul:treecols
146-
role: ROLE_LIST,
147-
children: [
148-
{
149-
// xul:treecol
150-
role: ROLE_COLUMNHEADER,
151-
children: []
152-
}
153-
]
154-
}
155-
]
156-
}
157-
]
158-
}
159-
);
160-
test_AutocompleteControl();
161-
162-
} else {
163-
SimpleTest.ok(true, "Testing (New) Toolkit autocomplete widget.");
164-
165-
// Dumb access to trigger popup lazy creation.
166-
dump("Trigget popup lazy creation");
167-
waitForEvent(EVENT_REORDER, txc, test_AutocompleteControl);
168-
txc.popup;
169-
170-
accTree.children.push(
171-
{
172-
role: ROLE_LIST,
173-
children: [
174-
{
175-
role: ROLE_LIST,
176-
children: [
177-
{
178-
role: ROLE_COLUMNHEADER,
179-
children: []
180-
}
181-
]
182-
}
183-
]
184-
}
185-
);
186-
}
129+
SimpleTest.ok(txc, "Testing (New) Toolkit autocomplete widget.");
130+
131+
// Dumb access to trigger popup lazy creation.
132+
dump("Trigget popup lazy creation");
133+
waitForEvent(EVENT_REORDER, txc, test_AutocompleteControl);
134+
txc.popup;
135+
136+
accTree.children.push(
137+
{
138+
role: ROLE_LIST,
139+
children: [
140+
{
141+
role: ROLE_LIST,
142+
children: [
143+
{
144+
role: ROLE_COLUMNHEADER,
145+
children: []
146+
}
147+
]
148+
}
149+
]
150+
}
151+
);
187152
}
188153
189154
SimpleTest.waitForExplicitFinish();

‎toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ let autoCompleteSimple = {
8080
8181
SimpleTest.waitForExplicitFinish();
8282
83-
// XPFE AutoComplete needs to register early.
84-
autoCompleteSimple.registerFactory();
85-
8683
let gACTimer;
8784
let gAutoComplete;
8885
@@ -96,6 +93,8 @@ function searchComplete() {
9693
}
9794
9895
function runTest() {
96+
97+
autoCompleteSimple.registerFactory();
9998
gAutoComplete = $("autocomplete");
10099
101100
const SEARCH_STRING = "res";

‎toolkit/content/tests/chrome/test_autocomplete_placehold_last_complete.xul

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ let autoCompleteSimple = {
106106
107107
SimpleTest.waitForExplicitFinish();
108108
109-
// XPFE AutoComplete needs to register early.
110-
autoCompleteSimple.registerFactory();
111-
112109
let gACTimer;
113110
let gAutoComplete;
114111
let asyncTest;
@@ -122,6 +119,7 @@ function finishTest() {
122119
}
123120
124121
function runTest() {
122+
autoCompleteSimple.registerFactory();
125123
gAutoComplete = $("autocomplete");
126124
gAutoComplete.focus();
127125

‎toolkit/content/xul.css

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -796,45 +796,8 @@ textbox[type="number"] {
796796

797797
/********** autocomplete textbox **********/
798798

799-
/* SeaMonkey does not use the new toolkit's autocomplete widget */
800-
%ifdef MOZ_SUITE
801-
802-
textbox[type="autocomplete"] {
803-
-moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete");
804-
}
805-
806-
panel[type="autocomplete"] {
807-
-moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete-result-popup");
808-
}
809-
810-
.autocomplete-history-popup {
811-
-moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete-history-popup");
812-
}
813-
814-
.autocomplete-treebody {
815-
-moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete-treebody");
816-
}
817-
818-
panel[type="autocomplete-richlistbox"] {
819-
-moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-rich-result-popup");
820-
}
821-
822-
.autocomplete-richlistbox {
823-
-moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-richlistbox");
824-
-moz-user-focus: ignore;
825-
}
826-
827-
.autocomplete-richlistbox > scrollbox {
828-
overflow-x: hidden !important;
829-
}
830-
831-
.autocomplete-richlistitem {
832-
-moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-richlistitem");
833-
-moz-box-orient: vertical;
834-
overflow: -moz-hidden-unscrollable;
835-
}
836-
837-
%else
799+
/* SeaMonkey uses its own autocomplete and the toolkit's autocomplete widget */
800+
%ifndef MOZ_SUITE
838801

839802
textbox[type="autocomplete"] {
840803
-moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete");

‎xpfe/components/autocomplete/jar.mn

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎xpfe/components/autocomplete/moz.build

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎xpfe/components/autocomplete/resources/content/autocomplete.css

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)