mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-09-13 12:20:12 +08:00
Merge branch 'master' into handleExtraObjectLiteralProperties
Conflicts: angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
This commit is contained in:
@@ -1 +0,0 @@
|
||||
|
||||
Vendored
+1
-1
@@ -830,7 +830,7 @@ declare module d3 {
|
||||
style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Transition<Datum>;
|
||||
style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Transition<Datum>;
|
||||
|
||||
styleTween(name: string, tween: (datum: Datum, index: number, attr: string) => Primitive, priority?: string): Transition<Datum>;
|
||||
styleTween(name: string, tween: (datum: Datum, index: number, attr: string) => (t: number) => Primitive, priority?: string): Transition<Datum>;
|
||||
|
||||
text(value: Primitive): Transition<Datum>;
|
||||
text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Transition<Datum>;
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
Reference in New Issue
Block a user