Menu
▾
▴
[HtmlUnit] SVN: [14541] trunk/htmlunit/src
|
From: <asa...@us...> - 2017-06-03 12:51:57
|
Revision: 14541
http://sourceforge.net/p/htmlunit/code/14541
Author: asashour
Date: 2017-06-03 12:51:54 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
Fix build
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2017-06-03 10:37:26 UTC (rev 14540)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2017-06-03 12:51:54 UTC (rev 14541)
@@ -2003,9 +2003,14 @@
* @return the value
*/
@JsxFunction({CHROME, FF})
- public boolean matches(final String selectorString) {
+ public static boolean matches(
+ final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
+ final String selectorString = (String) args[0];
+ if (!(thisObj instanceof Element)) {
+ throw ScriptRuntime.typeError("Illegal invocation");
+ }
try {
- final DomNode domNode = getDomNodeOrNull();
+ final DomNode domNode = ((Element) thisObj).getDomNodeOrNull();
return domNode != null && ((DomElement) domNode).matches(selectorString);
}
catch (final CSSException e) {
@@ -2021,8 +2026,9 @@
* @return the value
*/
@JsxFunction(FF)
- public boolean mozMatchesSelector(final String selectorString) {
- return matches(selectorString);
+ public static boolean mozMatchesSelector(
+ final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
+ return matches(context, thisObj, args, function);
}
/**
@@ -2031,8 +2037,9 @@
* @return the value
*/
@JsxFunction({CHROME, FF})
- public boolean webkitMatchesSelector(final String selectorString) {
- return matches(selectorString);
+ public static boolean webkitMatchesSelector(
+ final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
+ return matches(context, thisObj, args, function);
}
/**
@@ -2041,7 +2048,8 @@
* @return the value
*/
@JsxFunction(IE)
- public boolean msMatchesSelector(final String selectorString) {
- return matches(selectorString);
+ public static boolean msMatchesSelector(
+ final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
+ return matches(context, thisObj, args, function);
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java 2017-06-03 10:37:26 UTC (rev 14540)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java 2017-06-03 12:51:54 UTC (rev 14541)
@@ -1334,13 +1334,11 @@
}
/**
- * Test is based on a problem we had with jQuery 1.1.2 test suite.
* @throws Exception if an error occurs
*/
@Test
@Alerts({"TypeError", "done"})
- @NotYetImplemented
- public void matchesJQuery() throws Exception {
+ public void matchesWindow() throws Exception {
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
+ "<html><head>\n"
+ "<script>\n"
|
