Skip to content

Commit

Permalink
Upgrade third party dependency JavaScript-XPath to 0.1.12
Browse files Browse the repository at this point in the history
Amongst other improvements it fixes a typo bug which caused
initialization problems for BaseExprHasPredicates.

Thanks for Jacques Bonet <jacques.bonet@gmail.com> for noticing.
  • Loading branch information
andreastt committed Sep 9, 2014
1 parent eace3b0 commit 7f7a5af
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public static void init() {
appendFileContent(sb, "/core/xpath/xmltoken.js");
appendFileContent(sb, "/core/xpath/dom.js");
appendFileContent(sb, "/core/xpath/xpath.js");
appendFileContent(sb, "/core/xpath/javascript-xpath-0.1.11.js");
appendFileContent(sb, "/core/xpath/javascript-xpath-0.1.12.js");
appendFileContent(sb, "/core/scripts/user-extensions.js");
} catch (Exception e) {
if (failOnError) {
Expand Down Expand Up @@ -170,7 +170,7 @@ private static void writeScriptTags(OutputStream os) throws IOException {
writeScriptTag(os, "/core/xpath/xmltoken.js");
writeScriptTag(os, "/core/xpath/dom.js");
writeScriptTag(os, "/core/xpath/xpath.js");
writeScriptTag(os, "/core/xpath/javascript-xpath-0.1.11.js");
writeScriptTag(os, "/core/xpath/javascript-xpath-0.1.12.js");
writeScriptTag(os, "/core/scripts/user-extensions.js");
}

Expand Down
2 changes: 1 addition & 1 deletion javascript/selenium-core/RemoteRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<script language="JavaScript" type="text/javascript" src="xpath/xmltoken.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/dom.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/xpath.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/javascript-xpath-0.1.11.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/javascript-xpath-0.1.12.js"></script>
<script language="JavaScript" type="text/javascript" src="scripts/user-extensions.js"></script>
<script language="JavaScript" type="text/javascript">

Expand Down
2 changes: 1 addition & 1 deletion javascript/selenium-core/TestRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<script language="JavaScript" type="text/javascript" src="xpath/xmltoken.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/dom.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/xpath.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/javascript-xpath-0.1.11.js"></script>
<script language="JavaScript" type="text/javascript" src="xpath/javascript-xpath-0.1.12.js"></script>
<script language="JavaScript" type="text/javascript" src="scripts/user-extensions.js"></script>
</head>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* JavaScript-XPath 0.1.11
/* JavaScript-XPath 0.1.12
* (c) 2007 Cybozu Labs, Inc.
*
* JavaScript-XPath is freely distributable under the terms of an MIT-style license.
Expand Down Expand Up @@ -308,7 +308,7 @@ BaseExprHasPredicates.parsePredicates = function(lexer, expr) {
}
};

BaseExprHasPredicates.prototyps = new BaseExpr();
BaseExprHasPredicates.prototype = new BaseExpr();

BaseExprHasPredicates.prototype.evaluatePredicates = function(nodeset, start) {
var predicates, predicate, nodes, node, nodeset, position, reverse;
Expand Down

0 comments on commit 7f7a5af

Please sign in to comment.