Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into setAttribute-Truste…
Browse files Browse the repository at this point in the history
…dURL
  • Loading branch information
bicknellr committed May 13, 2020
2 parents 00b3670 + ac71e72 commit 1e29695
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/legacy/class.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export {mixinBehaviors};
* @returns Returns a new Element class extended by the
* passed in `behaviors` and also by `LegacyElementMixin`.
*/
declare function mixinBehaviors<T>(behaviors: object|object[], klass: {new(): T}): any;
declare function mixinBehaviors<T>(behaviors: object|object[], klass: {new(): T}): {new(): T};

export {Class};

Expand Down
3 changes: 3 additions & 0 deletions lib/legacy/polymer.dom.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export {matchesSelector};
*/
declare function matchesSelector(node: Node, selector: string): boolean;


export {DomApiNative as DomApi};

/**
* Node API wrapper class returned from `Polymer.dom.(target)` when
* `target` is a `Node`.
Expand Down
9 changes: 7 additions & 2 deletions lib/utils/settings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ export {setRootPath};
*/
declare function setRootPath(path: string): void;


export type SanitizeDOMValueFunction =
(value: unknown, name: string, type: 'property'|'attribute',
node: Node|null|undefined) => unknown;

export {setSanitizeDOMValue};


/**
* Sets the global sanitizeDOMValue available via this module's exported
* `sanitizeDOMValue` variable.
*/
declare function setSanitizeDOMValue(newSanitizeDOMValue: ((p0: any, p1: string, p2: string, p3: Node|null) => any)|undefined): void;
declare function setSanitizeDOMValue(newSanitizeDOMValue: SanitizeDOMValueFunction|undefined): void;

export {getSanitizeDOMValue};

Expand All @@ -29,7 +34,7 @@ export {getSanitizeDOMValue};
*
* @returns sanitizeDOMValue
*/
declare function getSanitizeDOMValue(): ((p0: any, p1: string, p2: string, p3: Node|null) => any)|undefined;
declare function getSanitizeDOMValue(): SanitizeDOMValueFunction|undefined;

export {setPassiveTouchGestures};

Expand Down

0 comments on commit 1e29695

Please sign in to comment.