Skip to content

Commit 6cf0703

Browse files
Gallery, LoadIndicator: remove 'm_' prefix from file names (DevExpress#30735)
1 parent a4d2c57 commit 6cf0703

File tree

9 files changed

+11
-18
lines changed

9 files changed

+11
-18
lines changed

packages/devextreme/js/__internal/ui/m_gallery.ts renamed to packages/devextreme/js/__internal/ui/gallery.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ class Gallery extends CollectionWidget<GalleryProperties, Item, CollectionItemKe
221221
});
222222
}
223223

224-
// eslint-disable-next-line class-methods-use-this
225224
_dataSourceOptions(): DataSourceOptions<Item> {
226225
return {
227226
paginate: false,
@@ -232,12 +231,10 @@ class Gallery extends CollectionWidget<GalleryProperties, Item, CollectionItemKe
232231
return this._$container;
233232
}
234233

235-
// eslint-disable-next-line class-methods-use-this
236234
_itemClass(): string {
237235
return GALLERY_ITEM_CLASS;
238236
}
239237

240-
// eslint-disable-next-line class-methods-use-this
241238
_itemDataKey(): string {
242239
return GALLERY_ITEM_DATA_KEY;
243240
}
@@ -848,9 +845,7 @@ class Gallery extends CollectionWidget<GalleryProperties, Item, CollectionItemKe
848845

849846
if (
850847
// @ts-expect-error ts-error
851-
this._dataSource
852-
// @ts-expect-error ts-error
853-
&& this._dataSource.paginate()
848+
this._dataSource?.paginate()
854849
&& this._shouldLoadNextPage(selectedIndex)
855850
// @ts-expect-error ts-error
856851
&& !this._isDataSourceLoading()
@@ -874,7 +869,6 @@ class Gallery extends CollectionWidget<GalleryProperties, Item, CollectionItemKe
874869
return selectedIndex + 2 * visiblePageSize > items.length;
875870
}
876871

877-
// eslint-disable-next-line class-methods-use-this
878872
_allowDynamicItemsAppend(): boolean {
879873
return true;
880874
}
@@ -938,7 +932,7 @@ class Gallery extends CollectionWidget<GalleryProperties, Item, CollectionItemKe
938932
const prevHidden = itemsCount < 2 || selectedIndex === 0;
939933

940934
// @ts-expect-error ts-error
941-
if (this._dataSource && this._dataSource.paginate()) {
935+
if (this._dataSource?.paginate()) {
942936
// @ts-expect-error ts-error
943937
nextHidden = nextHidden && this._isLastPage();
944938
} else {
@@ -1154,7 +1148,6 @@ class Gallery extends CollectionWidget<GalleryProperties, Item, CollectionItemKe
11541148
super._focusOutHandler(e);
11551149
}
11561150

1157-
// eslint-disable-next-line class-methods-use-this
11581151
_selectFocusedItem(): void {}
11591152

11601153
_moveFocus(location: string, e?: DxEvent<KeyboardEvent>): void {

packages/devextreme/js/__internal/ui/html_editor/ui/aiDialog.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import {
3232
} from '@ts/ui/html_editor/utils/ai';
3333
import { isSmallScreen } from '@ts/ui/html_editor/utils/small_screen';
3434
import type { Properties as InformerProperties } from '@ts/ui/informer/informer';
35-
import type { LoadIndicatorProperties } from '@ts/ui/m_load_indicator';
36-
import { AnimationType } from '@ts/ui/m_load_indicator';
35+
import type { LoadIndicatorProperties } from '@ts/ui/load_indicator';
36+
import { AnimationType } from '@ts/ui/load_indicator';
3737
import { TEXTEDITOR_INPUT_CONTAINER_CLASS } from '@ts/ui/text_box/m_text_editor.base';
3838

3939
export const AI_DIALOG_CLASS = 'dx-aidialog';

packages/devextreme/js/__internal/ui/m_load_indicator.ts renamed to packages/devextreme/js/__internal/ui/load_indicator.ts

File renamed without changes.

packages/devextreme/js/__internal/ui/tree_view/tree_view.base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import type {
4141
InternalNode, ItemData, ItemKey, PublicNode,
4242
} from '@ts/ui/hierarchical_collection/data_converter';
4343
import HierarchicalCollectionWidget from '@ts/ui/hierarchical_collection/hierarchical_collection_widget';
44-
import type { LoadIndicatorProperties } from '@ts/ui/m_load_indicator';
45-
import LoadIndicator from '@ts/ui/m_load_indicator';
44+
import type { LoadIndicatorProperties } from '@ts/ui/load_indicator';
45+
import LoadIndicator from '@ts/ui/load_indicator';
4646
import { DIRECTION_HORIZONTAL, DIRECTION_VERTICAL, SCROLLABLE_CONTENT_CLASS } from '@ts/ui/scroll_view/consts';
4747
import Scrollable from '@ts/ui/scroll_view/scrollable';
4848
import { getRelativeOffset } from '@ts/ui/scroll_view/utils/get_relative_offset';

packages/devextreme/js/ui/gallery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Gallery from '../__internal/ui/m_gallery';
1+
import Gallery from '../__internal/ui/gallery';
22

33
export default Gallery;
44

packages/devextreme/js/ui/load_indicator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import LoadIndicator from '../__internal/ui/m_load_indicator';
1+
import LoadIndicator from '../__internal/ui/load_indicator';
22

33
export default LoadIndicator;
44

packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/aiDialog.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { BUTTON_CLASS } from '__internal/ui/button/button';
2424
import {
2525
ANIMATION_TYPE_CLASSES,
2626
LOADINDICATOR_CONTENT_CLASS,
27-
} from '__internal/ui/m_load_indicator';
27+
} from '__internal/ui/load_indicator';
2828
import { AIIntegration } from '__internal/core/ai_integration/core/ai_integration';
2929
import { isPromise } from 'core/utils/type';
3030
import keyboardMock from '../../../helpers/keyboardMock.js';

packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.markup.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
LOADINDICATOR_IMAGE_CLASS,
1111
LOADINDICATOR_WRAPPER_CLASS,
1212
ANIMATION_TYPE_CLASSES,
13-
} from '__internal/ui/m_load_indicator';
13+
} from '__internal/ui/load_indicator';
1414

1515
import 'ui/load_indicator';
1616
import 'generic_light.css!';

packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
LOADINDICATOR_CONTENT_CLASS,
99
LOADINDICATOR_SEGMENT_CLASS,
1010
LOADINDICATOR_IMAGE_CLASS,
11-
} from '__internal/ui/m_load_indicator';
11+
} from '__internal/ui/load_indicator';
1212

1313
import 'ui/load_indicator';
1414
import 'generic_light.css!';

0 commit comments

Comments
 (0)