kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-22 20:39:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[angular][jquery] Fix merge issue with cssPropertySetter.

Browse Source
This commit is contained in:
Leonard Thieu
2017-06-26 17:36:16 -04:00
parent 1116ba09d4
commit efc67e63d9
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
types/angular/index.d.ts vendored
View File

@@ -1,6 +1,9 @@
// Type definitions for Angular JS 1.6
// Project: http://angularjs.org
// Definitions by: Diego Vilar <http://github.com/diegovilar>, Georgii Dolzhykov <http://github.com/thorn0>, Caleb St-Denis <https://github.com/calebstdenis>
// Definitions by: Diego Vilar <http://github.com/diegovilar>
// Georgii Dolzhykov <http://github.com/thorn0>
// Caleb St-Denis <https://github.com/calebstdenis>
// Leonard Thieu <https://github.com/leonard-thieu>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.3

4
types/angular/jqlite.d.ts vendored
View File

@@ -796,7 +796,9 @@ interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObjec
/**
* The interface used to specify the properties parameter in css()
*/
type cssPropertySetter = (index: number, value?: string) => string | number;
interface cssPropertySetter {
(index: number, value?: string): string | number;
}
interface JQueryCssProperties {
[propertyName: string]: string | number | cssPropertySetter;
}

4
types/jquery/v1/index.d.ts vendored
View File

@@ -702,7 +702,9 @@ interface JQueryCoordinates {
/**
* The interface used to specify the properties parameter in css()
*/
type cssPropertySetter = (index: number, value?: string) => string | number;
interface cssPropertySetter {
(index: number, value?: string): string | number;
}
interface JQueryCssProperties {
[propertyName: string]: string | number | cssPropertySetter;
}

4
types/jquery/v2/index.d.ts vendored
View File

@@ -702,7 +702,9 @@ interface JQueryCoordinates {
/**
* The interface used to specify the properties parameter in css()
*/
type cssPropertySetter = (index: number, value?: string) => string | number;
interface cssPropertySetter {
(index: number, value?: string): string | number;
}
interface JQueryCssProperties {
[propertyName: string]: string | number | cssPropertySetter;
}