Skip to content

Commit 2827312

Browse files
rbrirbri
committed
Chrome/Edge 143
1 parent 02c6617 commit 2827312

File tree

5 files changed

+129
-130
lines changed

5 files changed

+129
-130
lines changed

‎src/main/java/org/htmlunit/javascript/host/html/HTMLBodyElement.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
import static org.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
1818
import static org.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
19-
import static org.htmlunit.javascript.configuration.SupportedBrowser.FF;
20-
import static org.htmlunit.javascript.configuration.SupportedBrowser.FF_ESR;
2119

2220
import org.htmlunit.corejs.javascript.Function;
2321
import org.htmlunit.html.HtmlBody;
@@ -302,7 +300,7 @@ public void setOnbeforeunload(final Object onbeforeunload) {
302300
* Returns the {@code ongamepadconnected} event handler.
303301
* @return the {@code ongamepadconnected} event handler
304302
*/
305-
@JsxGetter({FF, FF_ESR})
303+
@JsxGetter
306304
public Function getOngamepadconnected() {
307305
return getEventHandler(Event.TYPE_GAMEPAD_CONNECTED);
308306
}
@@ -311,7 +309,7 @@ public Function getOngamepadconnected() {
311309
* Sets the {@code ongamepadconnected} event handler.
312310
* @param gamepadconnected the {@code ongamepadconnected} event handler
313311
*/
314-
@JsxSetter({FF, FF_ESR})
312+
@JsxSetter
315313
public void setOngamepadconnected(final Object gamepadconnected) {
316314
setEventHandler(Event.TYPE_GAMEPAD_CONNECTED, gamepadconnected);
317315
}
@@ -320,7 +318,7 @@ public void setOngamepadconnected(final Object gamepadconnected) {
320318
* Returns the {@code ongamepaddisconnected} event handler.
321319
* @return the {@code ongamepaddisconnected} event handler
322320
*/
323-
@JsxGetter({FF, FF_ESR})
321+
@JsxGetter
324322
public Function getOngamepaddisconnected() {
325323
return getEventHandler(Event.TYPE_GAMEPAD_DISCONNECTED);
326324
}
@@ -329,7 +327,7 @@ public Function getOngamepaddisconnected() {
329327
* Sets the {@code ongamepaddisconnected} event handler.
330328
* @param gamepaddisconnected the {@code ongamepaddisconnected} event handler
331329
*/
332-
@JsxSetter({FF, FF_ESR})
330+
@JsxSetter
333331
public void setOngamepaddisconnected(final Object gamepaddisconnected) {
334332
setEventHandler(Event.TYPE_GAMEPAD_DISCONNECTED, gamepaddisconnected);
335333
}

‎src/main/java/org/htmlunit/javascript/host/html/HTMLFrameSetElement.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
*/
1515
package org.htmlunit.javascript.host.html;
1616

17-
import static org.htmlunit.javascript.configuration.SupportedBrowser.FF;
18-
import static org.htmlunit.javascript.configuration.SupportedBrowser.FF_ESR;
19-
2017
import org.htmlunit.corejs.javascript.Function;
2118
import org.htmlunit.html.HtmlFrameSet;
2219
import org.htmlunit.javascript.configuration.JsxClass;
@@ -123,7 +120,7 @@ public void setOnbeforeunload(final Object beforeunload) {
123120
* Returns the {@code ongamepadconnected} event handler.
124121
* @return the {@code ongamepadconnected} event handler
125122
*/
126-
@JsxGetter({FF, FF_ESR})
123+
@JsxGetter
127124
public Function getOngamepadconnected() {
128125
return getEventHandler(Event.TYPE_GAMEPAD_CONNECTED);
129126
}
@@ -132,7 +129,7 @@ public Function getOngamepadconnected() {
132129
* Sets the {@code ongamepadconnected} event handler.
133130
* @param gamepadconnected the {@code ongamepadconnected} event handler
134131
*/
135-
@JsxSetter({FF, FF_ESR})
132+
@JsxSetter
136133
public void setOngamepadconnected(final Object gamepadconnected) {
137134
setEventHandler(Event.TYPE_GAMEPAD_CONNECTED, gamepadconnected);
138135
}
@@ -141,7 +138,7 @@ public void setOngamepadconnected(final Object gamepadconnected) {
141138
* Returns the {@code ongamepaddisconnected} event handler.
142139
* @return the {@code ongamepaddisconnected} event handler
143140
*/
144-
@JsxGetter({FF, FF_ESR})
141+
@JsxGetter
145142
public Function getOngamepaddisconnected() {
146143
return getEventHandler(Event.TYPE_GAMEPAD_DISCONNECTED);
147144
}
@@ -150,7 +147,7 @@ public Function getOngamepaddisconnected() {
150147
* Sets the {@code ongamepaddisconnected} event handler.
151148
* @param gamepaddisconnected the {@code ongamepaddisconnected} event handler
152149
*/
153-
@JsxSetter({FF, FF_ESR})
150+
@JsxSetter
154151
public void setOngamepaddisconnected(final Object gamepaddisconnected) {
155152
setEventHandler(Event.TYPE_GAMEPAD_DISCONNECTED, gamepaddisconnected);
156153
}

‎src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3350,17 +3350,17 @@ public void blockquote() throws Exception {
33503350
@Test
33513351
@Alerts(CHROME = "aLink[GSCE],background[GSCE],bgColor[GSCE],constructor(),link[GSCE],onafterprint[GSCE],"
33523352
+ "onbeforeprint[GSCE],onbeforeunload[GSCE],onblur[GSCE],onerror[GSCE],onfocus[GSCE],"
3353-
+ "onhashchange[GSCE],onlanguagechange[GSCE],onload[GSCE],onmessage[GSCE],onmessageerror[GSCE],"
3354-
+ "onoffline[GSCE],ononline[GSCE],onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],"
3355-
+ "onrejectionhandled[GSCE],onresize[GSCE],onscroll[GSCE],onstorage[GSCE],"
3356-
+ "onunhandledrejection[GSCE],onunload[GSCE],text[GSCE],"
3353+
+ "ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],onhashchange[GSCE],onlanguagechange[GSCE],"
3354+
+ "onload[GSCE],onmessage[GSCE],onmessageerror[GSCE],onoffline[GSCE],ononline[GSCE],"
3355+
+ "onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],onrejectionhandled[GSCE],onresize[GSCE],"
3356+
+ "onscroll[GSCE],onstorage[GSCE],onunhandledrejection[GSCE],onunload[GSCE],text[GSCE],"
33573357
+ "vLink[GSCE]",
33583358
EDGE = "aLink[GSCE],background[GSCE],bgColor[GSCE],constructor(),link[GSCE],onafterprint[GSCE],"
33593359
+ "onbeforeprint[GSCE],onbeforeunload[GSCE],onblur[GSCE],onerror[GSCE],onfocus[GSCE],"
3360-
+ "onhashchange[GSCE],onlanguagechange[GSCE],onload[GSCE],onmessage[GSCE],onmessageerror[GSCE],"
3361-
+ "onoffline[GSCE],ononline[GSCE],onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],"
3362-
+ "onrejectionhandled[GSCE],onresize[GSCE],onscroll[GSCE],onstorage[GSCE],"
3363-
+ "onunhandledrejection[GSCE],onunload[GSCE],text[GSCE],"
3360+
+ "ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],onhashchange[GSCE],onlanguagechange[GSCE],"
3361+
+ "onload[GSCE],onmessage[GSCE],onmessageerror[GSCE],onoffline[GSCE],ononline[GSCE],"
3362+
+ "onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],onrejectionhandled[GSCE],onresize[GSCE],"
3363+
+ "onscroll[GSCE],onstorage[GSCE],onunhandledrejection[GSCE],onunload[GSCE],text[GSCE],"
33643364
+ "vLink[GSCE]",
33653365
FF = "aLink[GSCE],background[GSCE],bgColor[GSCE],constructor(),link[GSCE],onafterprint[GSCE],"
33663366
+ "onbeforeprint[GSCE],onbeforeunload[GSCE],ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],"
@@ -6271,16 +6271,18 @@ public void frame() throws Exception {
62716271
*/
62726272
@Test
62736273
@Alerts(CHROME = "cols[GSCE],constructor(),onafterprint[GSCE],onbeforeprint[GSCE],onbeforeunload[GSCE],"
6274-
+ "onblur[GSCE],onerror[GSCE],onfocus[GSCE],onhashchange[GSCE],onlanguagechange[GSCE],onload[GSCE],"
6275-
+ "onmessage[GSCE],onmessageerror[GSCE],onoffline[GSCE],ononline[GSCE],onpagehide[GSCE],"
6276-
+ "onpageshow[GSCE],onpopstate[GSCE],onrejectionhandled[GSCE],onresize[GSCE],onscroll[GSCE],"
6277-
+ "onstorage[GSCE],onunhandledrejection[GSCE],onunload[GSCE],"
6274+
+ "onblur[GSCE],onerror[GSCE],onfocus[GSCE],ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],"
6275+
+ "onhashchange[GSCE],onlanguagechange[GSCE],onload[GSCE],onmessage[GSCE],onmessageerror[GSCE],"
6276+
+ "onoffline[GSCE],ononline[GSCE],onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],"
6277+
+ "onrejectionhandled[GSCE],onresize[GSCE],onscroll[GSCE],onstorage[GSCE],"
6278+
+ "onunhandledrejection[GSCE],onunload[GSCE],"
62786279
+ "rows[GSCE]",
62796280
EDGE = "cols[GSCE],constructor(),onafterprint[GSCE],onbeforeprint[GSCE],onbeforeunload[GSCE],"
6280-
+ "onblur[GSCE],onerror[GSCE],onfocus[GSCE],onhashchange[GSCE],onlanguagechange[GSCE],onload[GSCE],"
6281-
+ "onmessage[GSCE],onmessageerror[GSCE],onoffline[GSCE],ononline[GSCE],onpagehide[GSCE],"
6282-
+ "onpageshow[GSCE],onpopstate[GSCE],onrejectionhandled[GSCE],onresize[GSCE],onscroll[GSCE],"
6283-
+ "onstorage[GSCE],onunhandledrejection[GSCE],onunload[GSCE],"
6281+
+ "onblur[GSCE],onerror[GSCE],onfocus[GSCE],ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],"
6282+
+ "onhashchange[GSCE],onlanguagechange[GSCE],onload[GSCE],onmessage[GSCE],onmessageerror[GSCE],"
6283+
+ "onoffline[GSCE],ononline[GSCE],onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],"
6284+
+ "onrejectionhandled[GSCE],onresize[GSCE],onscroll[GSCE],onstorage[GSCE],"
6285+
+ "onunhandledrejection[GSCE],onunload[GSCE],"
62846286
+ "rows[GSCE]",
62856287
FF = "cols[GSCE],constructor(),onafterprint[GSCE],onbeforeprint[GSCE],onbeforeunload[GSCE],"
62866288
+ "ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],onhashchange[GSCE],onlanguagechange[GSCE],"
@@ -6295,10 +6297,12 @@ public void frame() throws Exception {
62956297
+ "onunhandledrejection[GSCE],onunload[GSCE],"
62966298
+ "rows[GSCE]")
62976299
@HtmlUnitNYI(CHROME = "cols[GSCE],constructor(),onafterprint[GSCE],onbeforeprint[GSCE],onbeforeunload[GSCE],"
6300+
+ "ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],"
62986301
+ "onhashchange[GSCE],onlanguagechange[GSCE],onmessage[GSCE],onmessageerror[GSCE],onoffline[GSCE],"
62996302
+ "ononline[GSCE],onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],onrejectionhandled[GSCE],"
63006303
+ "onstorage[GSCE],onunhandledrejection[GSCE],onunload[GSCE],rows[GSCE]",
63016304
EDGE = "cols[GSCE],constructor(),onafterprint[GSCE],onbeforeprint[GSCE],onbeforeunload[GSCE],"
6305+
+ "ongamepadconnected[GSCE],ongamepaddisconnected[GSCE],"
63026306
+ "onhashchange[GSCE],onlanguagechange[GSCE],onmessage[GSCE],onmessageerror[GSCE],onoffline[GSCE],"
63036307
+ "ononline[GSCE],onpagehide[GSCE],onpageshow[GSCE],onpopstate[GSCE],onrejectionhandled[GSCE],"
63046308
+ "onstorage[GSCE],onunhandledrejection[GSCE],onunload[GSCE],rows[GSCE]")
@@ -18004,11 +18008,11 @@ public void xmlHttpRequest() throws Exception {
1800418008
+ "isHistoryNavigation[GCE],json(),keepalive[GCE],method[GCE],mode[GCE],redirect[GCE],referrer[GCE],"
1800518009
+ "referrerPolicy[GCE],signal[GCE],targetAddressSpace[GCE],text(),"
1800618010
+ "url[GCE]",
18007-
EDGE = "arrayBuffer(),blob(),body[GCE],bodyUsed[GCE],bytes(),"
18008-
+ "cache[GCE],clone(),constructor(),credentials[GCE],"
18009-
+ "destination[GCE],duplex[GCE],formData(),headers[GCE],integrity[GCE],isHistoryNavigation[GCE],json(),"
18010-
+ "keepalive[GCE],method[GCE],mode[GCE],redirect[GCE],referrer[GCE],referrerPolicy[GCE],signal[GCE],"
18011-
+ "text(),url[GCE]",
18011+
EDGE = "arrayBuffer(),blob(),body[GCE],bodyUsed[GCE],bytes(),cache[GCE],clone(),constructor(),"
18012+
+ "credentials[GCE],destination[GCE],duplex[GCE],formData(),headers[GCE],integrity[GCE],"
18013+
+ "isHistoryNavigation[GCE],json(),keepalive[GCE],method[GCE],mode[GCE],redirect[GCE],referrer[GCE],"
18014+
+ "referrerPolicy[GCE],signal[GCE],targetAddressSpace[GCE],text(),"
18015+
+ "url[GCE]",
1801218016
FF = "arrayBuffer(),blob(),bodyUsed[GCE],bytes(),cache[GCE],clone(),constructor(),credentials[GCE],"
1801318017
+ "destination[GCE],formData(),headers[GCE],integrity[GCE],json(),keepalive[GCE],method[GCE],"
1801418018
+ "mode[GCE],redirect[GCE],referrer[GCE],referrerPolicy[GCE],signal[GCE],text(),"

0 commit comments

Comments
 (0)