Skip to content

Commit 06b7f3a

Browse files
committed
Merge pull request DefinitelyTyped#3006 from DevExpress/master
T155655: fix
2 parents 7be40b2 + 0189519 commit 06b7f3a

File tree

3 files changed

+214
-201
lines changed

3 files changed

+214
-201
lines changed

devextreme/dx.chartjs.d.ts

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
// Definitions: https://github.com/borisyankov/DefinitelyTyped
55

66
///<reference path="../jquery/jquery.d.ts" />
7-
declare module DevExpress {
8-
export function abstract(): void;
7+
8+
declare module DevExpress {
9+
export function abstract(): void;
910
export var rtlEnabled: boolean;
1011
export var hardwareBackButton: JQueryCallback;
1112
interface Endpoint {
@@ -83,8 +84,8 @@ export function abstract(): void;
8384
}): void;
8485
}
8586
}
86-
declare module DevExpress.data {
87-
export interface DataError extends Error {
87+
declare module DevExpress.data {
88+
export interface DataError extends Error {
8889
httpStatus?: number;
8990
errorDetails?: any;
9091
}
@@ -204,7 +205,7 @@ export interface DataError extends Error {
204205
export module queryAdapters {
205206
export function odata(queryOptions: ODataQueryOptions): RemoteQuery;
206207
}
207-
export interface DataSourceOptions {
208+
export interface DataSourceOptions {
208209
map? (item: any): any;
209210
postProcess? (result: any[]): any;
210211
pageSize: number;
@@ -244,7 +245,7 @@ export interface DataSourceOptions {
244245
load(): JQueryPromise<any>;
245246
dispose(): void;
246247
}
247-
export interface StoreOptions {
248+
export interface StoreOptions {
248249
key?: any;
249250
errorHandler?: ErrorHandler;
250251
loaded?: (result: Array<any>) => void;
@@ -350,7 +351,11 @@ export interface StoreOptions {
350351
objectLink(entityAlias: string, key: any): { __metadata: { uri: string }; };
351352
}
352353
}
353-
declare module DevExpress.ui {
354+
declare module DevExpress.ui {
355+
export var themes: {
356+
current(): string;
357+
current(themeName: string): void;
358+
};
354359
interface ViewportOptions {
355360
allowPan?: boolean;
356361
allowZoom?: boolean;
@@ -406,7 +411,7 @@ declare module DevExpress.ui {
406411
export function confirm(options: DialogOptions): JQueryPromise<boolean>;
407412
export function confirm(message: string, title?: string): JQueryPromise<boolean>;
408413
}
409-
export interface CollectionContainerWidgetOptions extends WidgetOptions {
414+
export interface CollectionContainerWidgetOptions extends WidgetOptions {
410415
items?: Array<any>;
411416
itemTemplate?: any;
412417
itemRender?: Function;
@@ -423,7 +428,7 @@ export interface CollectionContainerWidgetOptions extends WidgetOptions {
423428
constructor(element: Element, options?: CollectionContainerWidgetOptions);
424429
constructor(element: JQuery, options?: CollectionContainerWidgetOptions);
425430
}
426-
export interface WidgetOptions extends ComponentOptions {
431+
export interface WidgetOptions extends ComponentOptions {
427432
contentReadyAction?: any;
428433
width?: any;
429434
height?: any;
@@ -437,7 +442,7 @@ export interface WidgetOptions extends ComponentOptions {
437442
repaint(): void;
438443
addTemplate(template: ITemplate): void;
439444
}
440-
export interface dxEditorOptions extends WidgetOptions {
445+
export interface dxEditorOptions extends WidgetOptions {
441446
value?: any;
442447
valueChangeAction?: any;
443448
}
@@ -446,8 +451,8 @@ export interface dxEditorOptions extends WidgetOptions {
446451
constructor(element: JQuery, options?: dxEditorOptions);
447452
}
448453
}
449-
declare module DevExpress.viz {
450-
export class Chart extends Component {
454+
declare module DevExpress.viz {
455+
export class Chart extends Component {
451456
constructor(element: Element, options?: viz.charts.ChartOptions);
452457
constructor(element: JQuery, options?: viz.charts.ChartOptions);
453458
clearSelection(): void;
@@ -563,8 +568,8 @@ export class Chart extends Component {
563568
convertCoordinates(x: number, y: number): Array<number>;
564569
}
565570
}
566-
declare module DevExpress.viz.charts {
567-
interface z_BaseLegendOptions {
571+
declare module DevExpress.viz.charts {
572+
interface z_BaseLegendOptions {
568573
backgroundColor?: string;
569574
hoverMode?: string;
570575
customizeText?: (arg: {
@@ -930,8 +935,8 @@ interface z_BaseLegendOptions {
930935
asyncSeriesRendering?: boolean;
931936
}
932937
}
933-
declare module DevExpress.viz.charts.series {
934-
export interface z_BasePointStyle {
938+
declare module DevExpress.viz.charts.series {
939+
export interface z_BasePointStyle {
935940
color?: string;
936941
border?: {
937942
visible?: boolean;
@@ -1249,8 +1254,8 @@ export interface z_BasePointStyle {
12491254
isHovered(): boolean;
12501255
}
12511256
}
1252-
declare module DevExpress.viz.common {
1253-
export interface FontOptions {
1257+
declare module DevExpress.viz.common {
1258+
export interface FontOptions {
12541259
color?: string;
12551260
family?: string;
12561261
opacity?: number;
@@ -1300,8 +1305,8 @@ export interface FontOptions {
13001305
}
13011306
}
13021307
}
1303-
declare module DevExpress.viz.gauges {
1304-
interface CustomizeTextArgument {
1308+
declare module DevExpress.viz.gauges {
1309+
interface CustomizeTextArgument {
13051310
value: number;
13061311
valueText: string;
13071312
color: string;
@@ -1537,8 +1542,8 @@ interface CustomizeTextArgument {
15371542
pathModified?: boolean;
15381543
}
15391544
}
1540-
declare module DevExpress.viz.map {
1541-
interface TooltipOptions extends common.BaseTooltipOptions {
1545+
declare module DevExpress.viz.map {
1546+
interface TooltipOptions extends common.BaseTooltipOptions {
15421547
customizeText?: (arg: Proxy) => string;
15431548
customizeTooltip?: (arg: Proxy) => common.CustomizeTooltipResult;
15441549
borderColor?: string;
@@ -1634,8 +1639,8 @@ interface TooltipOptions extends common.BaseTooltipOptions {
16341639
coordinates(): Array<number>;
16351640
}
16361641
}
1637-
declare module DevExpress.viz.rangeSelector {
1638-
export interface SelectedRange {
1642+
declare module DevExpress.viz.rangeSelector {
1643+
export interface SelectedRange {
16391644
startValue: any; endValue: any;
16401645
}
16411646
interface CustomizeTextArgument {
@@ -1764,8 +1769,8 @@ export interface SelectedRange {
17641769
pathModified?: boolean;
17651770
}
17661771
}
1767-
declare module DevExpress.viz.sparklines {
1768-
interface z_SparklineTooltipFormatObject {
1772+
declare module DevExpress.viz.sparklines {
1773+
interface z_SparklineTooltipFormatObject {
17691774
firstValue?: string;
17701775
lastValue?: string;
17711776
maxValue?: string;
@@ -1839,7 +1844,7 @@ interface z_SparklineTooltipFormatObject {
18391844
}
18401845
}
18411846
interface JQuery {
1842-
dxChart(options?: DevExpress.viz.charts.ChartOptions): JQuery;
1847+
dxChart(options?: DevExpress.viz.charts.ChartOptions): JQuery;
18431848
dxChart(method: string, param1?:any, param2?:any): any;
18441849
dxPieChart(options?: DevExpress.viz.charts.PieOptions): JQuery;
18451850
dxPieChart(method: string, param1?: any, param2?: any): any;

0 commit comments

Comments
 (0)