+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
///
///
diff --git a/highcharts-ng/highcharts-ng-tests.ts b/highcharts-ng/highcharts-ng-tests.ts
index 925d398fb5..0bf559061b 100644
--- a/highcharts-ng/highcharts-ng-tests.ts
+++ b/highcharts-ng/highcharts-ng-tests.ts
@@ -1,5 +1,4 @@
-
-///
+///
var app = angular.module('app', ['highcharts-ng']);
diff --git a/highcharts/index.d.ts b/highcharts/index.d.ts
index 16151be327..b3dd4c6f28 100644
--- a/highcharts/index.d.ts
+++ b/highcharts/index.d.ts
@@ -724,6 +724,9 @@ interface HighchartsAxisOptions {
* @since 1.2.0
*/
startOnTick?: boolean;
+
+ stops?: [number, string][];
+
/**
* The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within
* a chart. This option overrides the tickPixelInterval option.
@@ -5456,6 +5459,7 @@ interface HighchartsOptions {
* lineWidth is specified in plotOptions.series, an individual lineWidth can be specified for each series.
*/
series?: HighchartsIndividualSeriesOptions[];
+
/**
* The chart's subtitle
*/
@@ -5478,6 +5482,7 @@ interface HighchartsOptions {
* horizontal axis. In case of multiple axes, the yAxis node is an array of configuration objects.
*/
yAxis?: HighchartsAxisOptions | HighchartsAxisOptions[];
+
}
interface HighchartsGlobalOptions extends HighchartsOptions {
diff --git a/js-data-angular/js-data-angular-tests.ts b/js-data-angular/js-data-angular-tests.ts
index 4e0293f4a1..13aff12d37 100644
--- a/js-data-angular/js-data-angular-tests.ts
+++ b/js-data-angular/js-data-angular-tests.ts
@@ -1,4 +1,6 @@
import * as JSData from 'js-data';
+import * as ng from 'angular';
+import * as angular from 'angular';
interface IUser {
diff --git a/jsnox/index.d.ts b/jsnox/index.d.ts
index 118ea364e7..f49cef58c4 100644
--- a/jsnox/index.d.ts
+++ b/jsnox/index.d.ts
@@ -40,7 +40,7 @@ interface CreateElement {
* @param children A single React node (string or ReactElement) or array of nodes.
* Note that unlike with React itself, multiple children must be placed into an array.
*/
- (specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.DOMElement
+ (specString: string, props?: React.HTMLAttributes<{}>, children?: React.ReactNode): React.DOMElement
/**
diff --git a/jsnox/jsnox-tests.ts b/jsnox/jsnox-tests.ts
index 05c8a81cb4..5d7440e315 100644
--- a/jsnox/jsnox-tests.ts
+++ b/jsnox/jsnox-tests.ts
@@ -15,7 +15,7 @@ var Person = React.createClass({
var PersonTag = React.createFactory(Person);
-var clickHandler: React.MouseEventHandler
+var clickHandler: React.MouseEventHandler<{}>;
// Tests with spec string
function spec_string () {
diff --git a/json-patch/json-patch-tests.ts b/json-patch/json-patch-tests.ts
index b57f1d6fe0..3c3ff51f22 100644
--- a/json-patch/json-patch-tests.ts
+++ b/json-patch/json-patch-tests.ts
@@ -1,5 +1,4 @@
-
-
+import jsonpatch = require("json-patch");
import jp = require("json-patch");
// Add property, result: {foo: 'bar'}
diff --git a/karma-coverage/index.d.ts b/karma-coverage/index.d.ts
index dd6a382239..20ee56f43c 100644
--- a/karma-coverage/index.d.ts
+++ b/karma-coverage/index.d.ts
@@ -29,6 +29,7 @@ declare namespace karmaCoverage {
includeAllSources?: boolean;
sourceStore?: istanbul.Store;
instrumenter?: any;
+ [moreSettings: string]: any;
}
}
diff --git a/karma-coverage/karma-coverage-tests.ts b/karma-coverage/karma-coverage-tests.ts
index a59ca7cdea..4f0b187a7a 100644
--- a/karma-coverage/karma-coverage-tests.ts
+++ b/karma-coverage/karma-coverage-tests.ts
@@ -1,7 +1,5 @@
-
import * as karma from 'karma-coverage';
-
// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/README.md#basic
module.exports = function(config: karma.Config) {
config.set({
diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index 00080d39a6..84b42a1b9c 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -103,7 +103,7 @@ declare namespace __MaterialUI {
}
// What's common between React.TouchEvent and React.MouseEvent
- interface TouchTapEvent extends React.SyntheticEvent {
+ interface TouchTapEvent extends React.SyntheticEvent<{}> {
altKey: boolean;
ctrlKey: boolean;
getModifierState(key: string): boolean;
@@ -554,11 +554,11 @@ declare namespace __MaterialUI {
focusRippleOpacity?: number;
keyboardFocused?: boolean;
linkButton?: boolean;
- onBlur?: React.FocusEventHandler;
- onFocus?: React.FocusEventHandler;
- onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
- onKeyDown?: React.KeyboardEventHandler;
- onKeyUp?: React.KeyboardEventHandler;
+ onBlur?: React.FocusEventHandler<{}>;
+ onFocus?: React.FocusEventHandler<{}>;
+ onKeyboardFocus?: (e: React.FocusEvent<{}>, isKeyboardFocused: boolean) => void;
+ onKeyDown?: React.KeyboardEventHandler<{}>;
+ onKeyUp?: React.KeyboardEventHandler<{}>;
onTouchTap?: TouchTapEventHandler;
style?: React.CSSProperties;
tabIndex?: number;
@@ -567,7 +567,7 @@ declare namespace __MaterialUI {
type?: string;
}
- interface EnhancedButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps {
+ interface EnhancedButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps {
// container element, , or (if disabled link) is the element that get the 'other' properties
containerElement?: React.ReactNode | string;
disabled?: boolean;
@@ -575,7 +575,7 @@ declare namespace __MaterialUI {
export class EnhancedButton extends React.Component {
}
- interface FlatButtonProps extends React.DOMAttributes, SharedEnhancedButtonProps {
+ interface FlatButtonProps extends React.DOMAttributes<{}>, SharedEnhancedButtonProps {
// is the element that get the 'other' properties
backgroundColor?: string;
disabled?: boolean;
@@ -586,10 +586,10 @@ declare namespace __MaterialUI {
labelPosition?: string; // oneOf(['left', 'right'])
labelStyle?: React.CSSProperties;
linkButton?: boolean;
- onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
- onMouseEnter?: React.MouseEventHandler;
- onMouseLeave?: React.MouseEventHandler;
- onTouchStart?: React.TouchEventHandler;
+ onKeyboardFocus?: (e: React.FocusEvent<{}>, isKeyboardFocused: boolean) => void;
+ onMouseEnter?: React.MouseEventHandler<{}>;
+ onMouseLeave?: React.MouseEventHandler<{}>;
+ onTouchStart?: React.TouchEventHandler<{}>;
primary?: boolean;
rippleColor?: string;
secondary?: boolean;
@@ -613,12 +613,12 @@ declare namespace __MaterialUI {
labelPosition?: string; // oneOf(['left', 'right'])
labelStyle?: React.CSSProperties;
linkButton?: boolean;
- onMouseDown?: React.MouseEventHandler;
- onMouseEnter?: React.MouseEventHandler;
- onMouseLeave?: React.MouseEventHandler;
- onMouseUp?: React.MouseEventHandler;
- onTouchEnd?: React.TouchEventHandler;
- onTouchStart?: React.TouchEventHandler;
+ onMouseDown?: React.MouseEventHandler<{}>;
+ onMouseEnter?: React.MouseEventHandler<{}>;
+ onMouseLeave?: React.MouseEventHandler<{}>;
+ onMouseUp?: React.MouseEventHandler<{}>;
+ onTouchEnd?: React.TouchEventHandler<{}>;
+ onTouchStart?: React.TouchEventHandler<{}>;
primary?: boolean;
rippleStyle?: React.CSSProperties;
secondary?: boolean;
@@ -627,7 +627,7 @@ declare namespace __MaterialUI {
export class RaisedButton extends React.Component {
}
- interface FloatingActionButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps {
+ interface FloatingActionButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps {
// is the element that get the 'other' properties
backgroundColor?: string;
className?: string;
@@ -638,12 +638,12 @@ declare namespace __MaterialUI {
iconStyle?: React.CSSProperties;
linkButton?: boolean;
mini?: boolean;
- onMouseDown?: React.MouseEventHandler;
- onMouseEnter?: React.MouseEventHandler;
- onMouseLeave?: React.MouseEventHandler;
- onMouseUp?: React.MouseEventHandler;
- onTouchEnd?: React.TouchEventHandler;
- onTouchStart?: React.TouchEventHandler;
+ onMouseDown?: React.MouseEventHandler<{}>;
+ onMouseEnter?: React.MouseEventHandler<{}>;
+ onMouseLeave?: React.MouseEventHandler<{}>;
+ onMouseUp?: React.MouseEventHandler<{}>;
+ onTouchEnd?: React.TouchEventHandler<{}>;
+ onTouchStart?: React.TouchEventHandler<{}>;
secondary?: boolean;
style?: React.CSSProperties;
zDepth?: number;
@@ -651,17 +651,17 @@ declare namespace __MaterialUI {
export class FloatingActionButton extends React.Component {
}
- interface IconButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps {
+ interface IconButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps {
// is the element that get the 'other' properties
className?: string;
disabled?: boolean;
iconClassName?: string;
iconStyle?: React.CSSProperties;
- onBlur?: React.FocusEventHandler;
- onFocus?: React.FocusEventHandler;
- onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
- onMouseEnter?: React.MouseEventHandler;
- onMouseLeave?: React.MouseEventHandler;
+ onBlur?: React.FocusEventHandler<{}>;
+ onFocus?: React.FocusEventHandler<{}>;
+ onKeyboardFocus?: (e: React.FocusEvent<{}>, isKeyboardFocused: boolean) => void;
+ onMouseEnter?: React.MouseEventHandler<{}>;
+ onMouseLeave?: React.MouseEventHandler<{}>;
style?: React.CSSProperties;
tooltip?: string;
tooltipPosition?: string;
@@ -773,9 +773,9 @@ declare namespace __MaterialUI {
mode?: string;
onChange?: (e: any, date: Date) => void; // e is always null
onDismiss?: () => void;
- onFocus?: React.FocusEventHandler;
+ onFocus?: React.FocusEventHandler<{}>;
onShow?: () => void;
- onTouchTap?: React.TouchEventHandler;
+ onTouchTap?: React.TouchEventHandler<{}>;
shouldDisableDate?: (day: Date) => boolean;
/** @deprecated use noFilter instead */
showYearSelector?: boolean;
@@ -797,8 +797,8 @@ declare namespace __MaterialUI {
hintText?: React.ReactNode;
id?: string;
inputStyle?: React.CSSProperties;
- onBlur?: React.FocusEventHandler;
- onKeyDown?: React.KeyboardEventHandler;
+ onBlur?: React.FocusEventHandler<{}>;
+ onKeyDown?: React.KeyboardEventHandler<{}>;
rows?: number,
rowsMax?: number,
type?: string;
@@ -837,12 +837,12 @@ declare namespace __MaterialUI {
/** @deprecated use array of components instead */
export interface DialogAction {
id?: string;
- onClick?: React.MouseEventHandler;
+ onClick?: React.MouseEventHandler<{}>;
onTouchTap?: TouchTapEventHandler;
ref?: string;
text: string;
}
- interface DialogProps extends React.DOMAttributes, React.Props