Skip to content

evaluate should allow null for resolver and result #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2016
Merged

evaluate should allow null for resolver and result #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51f82d9
evaluate should allow null resolver / result
goenning Nov 8, 2016
5ebdd22
fix return type and allow null for XPathExpression.evaluate
goenning Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions baselines/dom.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2969,7 +2969,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
* @param y The y-offset
*/
elementFromPoint(x: number, y: number): Element;
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
/**
* Executes a command on the current document, current selection, or the given range.
* @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script.
Expand Down Expand Up @@ -13217,7 +13217,7 @@ declare var XMLSerializer: {
interface XPathEvaluator {
createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
createNSResolver(nodeResolver?: Node): XPathNSResolver;
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
}

declare var XPathEvaluator: {
Expand All @@ -13226,7 +13226,7 @@ declare var XPathEvaluator: {
}

interface XPathExpression {
evaluate(contextNode: Node, type: number, result: XPathResult): XPathExpression;
evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult;
}

declare var XPathExpression: {
Expand Down
18 changes: 18 additions & 0 deletions inputfiles/overridingTypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,5 +906,23 @@
"readonly": true,
"name": "types",
"type": "string[]"
},
{
"kind": "method",
"interface": "XPathEvaluator",
"name": "evaluate",
"signatures": ["evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult"]
},
{
"kind": "method",
"interface": "Document",
"name": "evaluate",
"signatures": ["evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult"]
},
{
"kind": "method",
"interface": "XPathExpression",
"name": "evaluate",
"signatures": ["evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult"]
}
]