Skip to content

Commit e5cbfd0

Browse files
FilterBuilder, Draggable, Sortable: remove m_ prefix (#35525)
1 parent 980c9bf commit e5cbfd0

32 files changed

Lines changed: 43 additions & 46 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
/packages/devextreme/js/ui/sortable.d.ts @DevExpress/devextreme-grids
7878

7979
/packages/devextreme/js/ui/sortable.js @DevExpress/devextreme-grids
80-
/packages/devextreme/js/__internal/m_sortable.ts @DevExpress/devextreme-grids
80+
/packages/devextreme/js/__internal/sortable.ts @DevExpress/devextreme-grids
8181

8282
/packages/devextreme-scss/scss/widgets/base/_sortable.scss @DevExpress/devextreme-grids
8383
/packages/devextreme-scss/scss/widgets/fluent/sortable/** @DevExpress/devextreme-grids
@@ -92,7 +92,7 @@
9292
/packages/devextreme/js/ui/draggable.d.ts @DevExpress/devextreme-grids
9393

9494
/packages/devextreme/js/ui/draggable.js @DevExpress/devextreme-grids
95-
/packages/devextreme/js/__internal/m_draggable.ts @DevExpress/devextreme-grids
95+
/packages/devextreme/js/__internal/draggable.ts @DevExpress/devextreme-grids
9696

9797
/packages/devextreme-scss/scss/widgets/base/_draggable.scss @DevExpress/devextreme-grids
9898

packages/devextreme/js/__internal/m_draggable.ts renamed to packages/devextreme/js/__internal/draggable.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,6 +1404,13 @@ class Draggable<
14041404
this._stopAnimator();
14051405
}
14061406

1407+
/// #DEBUG
1408+
// Test-only accessor, removed from production builds.
1409+
getDragInProgress(): boolean {
1410+
return !!this.dragInProgress;
1411+
}
1412+
/// #ENDDEBUG
1413+
14071414
_fireDragEnterEvent(sourceEvent: DragEvent): void {
14081415
const args = this._getEventArgs(sourceEvent);
14091416

@@ -1415,13 +1422,6 @@ class Draggable<
14151422

14161423
this._getAction('onDragLeave')(args);
14171424
}
1418-
1419-
/// #DEBUG
1420-
// Test-only accessor, removed from production builds.
1421-
getDragInProgress(): boolean {
1422-
return !!this.dragInProgress;
1423-
}
1424-
/// #ENDDEBUG
14251425
}
14261426

14271427
registerComponent(DRAGGABLE, Draggable);

‎packages/devextreme/js/__internal/filter_builder/__tests__/utils.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, it } from '@jest/globals';
22
import type { CustomOperation, Field } from '@js/ui/filter_builder';
33

4-
import { getCurrentValueText, getFilterOperations } from '../m_utils';
4+
import { getCurrentValueText, getFilterOperations } from '../utils';
55

66
describe('Formatting', () => {
77
it('empty string', () => {

packages/devextreme/js/__internal/filter_builder/m_between.ts renamed to packages/devextreme/js/__internal/filter_builder/between.ts

File renamed without changes.

packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts renamed to packages/devextreme/js/__internal/filter_builder/filter_builder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import type { OptionChanged } from '@ts/core/widget/types';
2222
import Widget from '@ts/core/widget/widget';
2323
import { getElementMaxHeightByWindow } from '@ts/ui/overlay/utils';
2424

25-
import type { EditorFactoryOwner } from './m_between';
25+
import type { EditorFactoryOwner } from './between';
2626
import type {
2727
Condition,
2828
ConditionValue,
@@ -32,7 +32,7 @@ import type {
3232
FilterExpression,
3333
GroupMenuItem,
3434
OperationMenuItem,
35-
} from './m_utils';
35+
} from './utils';
3636
import {
3737
addItem, convertToInnerStructure,
3838
createCondition, createEmptyGroup,
@@ -44,7 +44,7 @@ import {
4444
getOperationFromAvailable,
4545
getOperationValue, isCondition, isGroup, removeItem, renderValueText, setGroupValue,
4646
updateConditionByOperation,
47-
} from './m_utils';
47+
} from './utils';
4848

4949
const FILTER_BUILDER_CLASS = 'dx-filterbuilder';
5050
const FILTER_BUILDER_GROUP_CLASS = `${FILTER_BUILDER_CLASS}-group`;

packages/devextreme/js/__internal/filter_builder/m_filter_operations_dictionary.ts renamed to packages/devextreme/js/__internal/filter_builder/filter_operations_dictionary.ts

File renamed without changes.

packages/devextreme/js/__internal/filter_builder/m_utils.ts renamed to packages/devextreme/js/__internal/filter_builder/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import filterUtils from '@js/ui/shared/filtering';
1818
import errors from '@js/ui/widget/ui.errors';
1919
import { getGlobalFormatByDataType } from '@ts/core/global_format_config';
2020

21-
import type { EditorFactoryOwner } from './m_between';
22-
import { getConfig } from './m_between';
23-
import filterOperationsDictionary from './m_filter_operations_dictionary';
21+
import type { EditorFactoryOwner } from './between';
22+
import { getConfig } from './between';
23+
import filterOperationsDictionary from './filter_operations_dictionary';
2424

2525
type FieldValue = string | number | boolean | Date | null | undefined;
2626
export type ConditionValue = FieldValue | FieldValue[];

‎packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,9 @@ export class ColumnsSeparatorView extends SeparatorView {
189189

190190
private _isTransparent?: boolean;
191191

192-
/// #DEBUG
193192
private _testPosX?: number;
194193

195194
private _testCursorName?: string;
196-
/// #ENDDEBUG
197195

198196
public init() {
199197
super.init();
@@ -410,9 +408,7 @@ export class DraggingHeaderView extends modules.View {
410408

411409
private _onSelectStart: any;
412410

413-
/// #DEBUG
414411
private _testPointsByColumns: any;
415-
/// #ENDDEBUG
416412

417413
private getSourceDraggingPanel(): DraggingPanel {
418414
const {

‎packages/devextreme/js/__internal/grids/grid_core/filter_builder/m_filter_builder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import FilterBuilder from '@js/ui/filter_builder';
88
import Popup from '@js/ui/popup/ui.popup';
99
import ScrollView from '@js/ui/scroll_view';
1010
import { restoreFocus } from '@js/ui/shared/accessibility';
11-
import { getFilterExpression, removeFieldConditionsFromFilter } from '@ts/filter_builder/m_utils';
11+
import { getFilterExpression, removeFieldConditionsFromFilter } from '@ts/filter_builder/utils';
1212
import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller';
1313
import modules from '@ts/grids/grid_core/modules/modules';
1414

‎packages/devextreme/js/__internal/grids/grid_core/filter_panel/m_filter_panel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import inflector from '@ts/core/utils/m_inflector';
1111
import {
1212
getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText,
1313
getCustomOperation, getField, getGroupValue, isCondition, isGroup,
14-
} from '@ts/filter_builder/m_utils';
14+
} from '@ts/filter_builder/utils';
1515
import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller';
1616
import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller';
1717
import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller';

0 commit comments

Comments
 (0)