Merge pull request #2998 from DevExpress/master

Update to 14.1.7
This commit is contained in:
Masahiro Wakame
2014-10-21 12:03:18 +09:00
3 changed files with 54 additions and 7 deletions

View File

@@ -4,7 +4,6 @@
// Definitions: https://github.com/borisyankov/DefinitelyTyped
///<reference path="../jquery/jquery.d.ts" />
declare module DevExpress {
export function abstract(): void;
export var rtlEnabled: boolean;

View File

@@ -751,8 +751,8 @@ export interface ILayoutController {
static create(container: JQuery, options: TransitionExecutorOptions): TransitionExecutor;
}
export interface ViewEngineOptions {
$root?: JQuery;
device?: IDevice;
$root: JQuery;
device: IDevice;
commandManager?: CommandManager;
templateEngine?: ITemplateEngine;
dataOptionsAttributeName?: string;
@@ -906,9 +906,10 @@ export interface dxAutocompleteOptions extends dxDropDownEditorOptions {
}
export interface dxButtonOptions extends WidgetOptions {
type?: string;
text?: string;
text?: string;
icon?: string;
iconSrc?: string;
clickAction?: any;
}
export class dxButton extends Widget {
constructor(element: Element, options?: dxButtonOptions);

View File

@@ -751,8 +751,8 @@ export interface ILayoutController {
static create(container: JQuery, options: TransitionExecutorOptions): TransitionExecutor;
}
export interface ViewEngineOptions {
$root?: JQuery;
device?: IDevice;
$root: JQuery;
device: IDevice;
commandManager?: CommandManager;
templateEngine?: ITemplateEngine;
dataOptionsAttributeName?: string;
@@ -906,9 +906,10 @@ export interface dxAutocompleteOptions extends dxDropDownEditorOptions {
}
export interface dxButtonOptions extends WidgetOptions {
type?: string;
text?: string;
text?: string;
icon?: string;
iconSrc?: string;
clickAction?: any;
}
export class dxButton extends Widget {
constructor(element: Element, options?: dxButtonOptions);
@@ -1536,6 +1537,7 @@ export interface dxDataGridFilterDescriptions {
getSelectedRowKeys: () => Array<any>;
getSelectedRowsData: () => Array<any>;
selectRows: (keys: Array<any>) => void;
selectRowsByIndexes: (indexes: Array<any>) => void;
searchByText: (text: string) => void;
insertRow: () => void;
editRow: (rowIndex: number) => void;
@@ -1560,6 +1562,48 @@ export interface dxDataGridFilterDescriptions {
isScrollbarVisible: () => boolean;
getTopVisibleRowData: () => {};
}
export interface dxMenuOptions extends CollectionContainerWidgetOptions {
orientation?: string;
submenuDirection?: string;
showFirstSubmenuMode?: string;
enableHotTrack?: boolean;
allowSelection?: boolean;
allowSelectOnClick?: boolean;
selectedItem?: any;
itemSelectAction?: any;
cssClass?: string;
}
export interface dxContextMenuOptions extends CollectionContainerWidgetOptions {
showSubmenuMode?: string;
invokeOnlyFromCode?: boolean;
cssClass?: string;
enableHotTrack?: boolean;
allowSelection?: boolean;
allowSelectOnClick?: boolean;
selectedItem?: any;
itemSelectAction?: any;
animation?: any;
position?: any;
showingAction?: any;
submenuDirection?: string;
}
export class dxMenu extends CollectionContainerWidget {
constructor(element: Element, options?: dxMenuOptions);
constructor(element: JQuery, options?: dxMenuOptions);
}
export class dxContextMenu extends CollectionContainerWidget {
constructor(element: Element, options?: dxContextMenuOptions);
constructor(element: JQuery, options?: dxContextMenuOptions);
}
export interface dxColorPickerOptions extends dxDropDownEditorOptions {
editAlphaChannel?: boolean;
applyButtonText?: string;
cancelButtonText?: string;
}
export class dxColorPicker extends dxDropDownEditor {
constructor(element: Element, options?: dxColorPickerOptions);
constructor(element: JQuery, options?: dxColorPickerOptions);
}
}
interface JQuery {
dxAutocomplete(options?: DevExpress.ui.dxAutocompleteOptions): JQuery;
@@ -1594,4 +1638,7 @@ dxLoadIndicator(options?: DevExpress.ui.dxLoadIndicatorOptions): JQuery;
dxMultiView(options?: DevExpress.ui.dxMultiViewOptions): JQuery;
dxGallery(options?: DevExpress.ui.dxGalleryOptions): JQuery;
dxDataGrid(options?: DevExpress.ui.dxDataGridOptions): JQuery;
dxMenu(options?: DevExpress.ui.dxMenuOptions): JQuery;
dxContextMenu(options?: DevExpress.ui.dxContextMenuOptions): JQuery;
dxColorPicker(options?: DevExpress.ui.dxColorPickerOptions): JQuery;
}