Skip to content

Commit

Permalink
Release 18.1.2-pre-beta
Browse files Browse the repository at this point in the history
Cherry-picked changesets:
  45b12d4 Alyar - dxDataGrid - remove doc comments for the 'command' option of the columns (#3721)
  • Loading branch information
BingoRUS committed May 8, 2018
1 parent 2876b98 commit daea5fd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 22 deletions.
10 changes: 0 additions & 10 deletions js/docEnums.js
Original file line number Diff line number Diff line change
Expand Up @@ -785,16 +785,6 @@
* @enum {'avg'|'custom'}
*/

/**
* @typedef {string} Enums.GridCommandColumnType
* @enum {'adaptive'|'edit'|'expand'|'select'}
*/

/**
* @typedef {string} Enums.TreeListCommandColumnType
* @enum {'adaptive'|'edit'}
*/

/**
* @typedef {string} Enums.DataSourceStoreType
* @enum {'array'|'local'|'odata'}
Expand Down
10 changes: 0 additions & 10 deletions js/ui/grid_core/ui.grid_core.columns_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -603,16 +603,6 @@ module.exports = {
* @publicName formItem
* @type dxFormSimpleItem
*/
/**
* @name dxDataGridColumn_command
* @publicName command
* @type string|Enums.GridCommandColumnType
*/
/**
* @name dxTreeListColumn_command
* @publicName command
* @type string|Enums.TreeListCommandColumnType
*/
regenerateColumnsByVisibleItems: false,
/**
* @name dxDataGridOptions_customizeColumns
Expand Down
2 changes: 0 additions & 2 deletions ts/dx.all.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4497,7 +4497,6 @@ declare module DevExpress.ui {
calculateGroupValue?: string | ((rowData: any) => any);
/** An array of grid columns. */
columns?: Array<dxDataGridColumn>;
command?: string | 'adaptive' | 'edit' | 'expand' | 'select';
/** Specifies a custom template for group cells. */
groupCellTemplate?: template | ((cellElement: DevExpress.core.dxElement, cellInfo: any) => any);
/** Specifies the index of a column when grid records are grouped by the values of this column. */
Expand Down Expand Up @@ -4912,7 +4911,6 @@ declare module DevExpress.ui {
export interface dxTreeListColumn extends GridBaseColumn {
/** Configures columns. */
columns?: Array<dxTreeListColumn>;
command?: string | 'adaptive' | 'edit';
}
/** This section describes the properties of a grid row. An object containing these properties comes to certain event-handling functions. */
export interface dxDataGridRowObject {
Expand Down

0 comments on commit daea5fd

Please sign in to comment.