From 8ae7c9ae77e27f6479a07cd1cfe3fbde10ca0693 Mon Sep 17 00:00:00 2001 From: ivanblinov2k17 Date: Tue, 15 Oct 2024 21:41:21 +0400 Subject: [PATCH] Core: dom -> m_dom;: common, type -> m_ only for helpers --- packages/devextreme/testing/helpers/chartMocks.js | 4 ++-- packages/devextreme/testing/helpers/dataGridMocks.js | 12 ++++++------ packages/devextreme/testing/helpers/treeListMocks.js | 12 ++++++------ .../testing/tests/DevExpress.core/utils.dom.tests.js | 2 +- .../DevExpress.ui.widgets.editors/tagBox.tests.js | 2 +- .../scrollableParts/scrollable.main.tests.js | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/devextreme/testing/helpers/chartMocks.js b/packages/devextreme/testing/helpers/chartMocks.js index 5b19b0fa065e..d12be88bf607 100644 --- a/packages/devextreme/testing/helpers/chartMocks.js +++ b/packages/devextreme/testing/helpers/chartMocks.js @@ -1,8 +1,8 @@ /* global currentAssert */ import $ from 'jquery'; import Class from 'core/class'; -import commonUtils from 'core/utils/common'; -import typeUtils from 'core/utils/type'; +import commonUtils from '__internal/core/utils/m_common'; +import typeUtils from '__internal/core/utils/m_type'; import loadingIndicatorModule from 'viz/core/loading_indicator'; import axisModule from 'viz/axes/base_axis'; import pointModule from 'viz/series/points/base_point'; diff --git a/packages/devextreme/testing/helpers/dataGridMocks.js b/packages/devextreme/testing/helpers/dataGridMocks.js index 25cae9f39ada..5e004fc85ec8 100644 --- a/packages/devextreme/testing/helpers/dataGridMocks.js +++ b/packages/devextreme/testing/helpers/dataGridMocks.js @@ -9,9 +9,9 @@ if(typeof define === 'function' && define.amd) { require('jquery'), require('__internal/grids/data_grid/m_core').default, require('__internal/grids/data_grid/module_not_extended/columns_resizing_reordering').default, - require('core/utils/dom'), - require('core/utils/common'), - require('core/utils/type'), + require('__internal/core/utils/m_dom'), + require('__internal/core/utils/m_common'), + require('__internal/core/utils/m_type'), require('data/array_store'), 'DataGrid' ); @@ -23,9 +23,9 @@ if(typeof define === 'function' && define.amd) { jQuery, DevExpress.require('__internal/grids/data_grid/m_core'), DevExpress.require('__internal/grids/data_grid/module_not_extended/columns_resizing_reordering'), - DevExpress.require('core/utils/dom'), - DevExpress.require('core/utils/common'), - DevExpress.require('core/utils/type'), + DevExpress.require('__internal/core/utils/m_dom'), + DevExpress.require('__internal/core/utils/m_common'), + DevExpress.require('__internal/core/utils/m_type'), DevExpress.require('data/array_store'), 'DataGrid' )); diff --git a/packages/devextreme/testing/helpers/treeListMocks.js b/packages/devextreme/testing/helpers/treeListMocks.js index 1b5b0bc32152..da98c335a813 100644 --- a/packages/devextreme/testing/helpers/treeListMocks.js +++ b/packages/devextreme/testing/helpers/treeListMocks.js @@ -9,9 +9,9 @@ if(typeof define === 'function' && define.amd) { require('jquery'), require('__internal/grids/tree_list/m_core').default, null, - require('core/utils/dom'), - require('core/utils/common'), - require('core/utils/type'), + require('__internal/core/utils/m_dom'), + require('__internal/core/utils/m_common'), + require('__internal/core/utils/m_type'), require('data/array_store'), 'TreeList' ); @@ -23,9 +23,9 @@ if(typeof define === 'function' && define.amd) { jQuery, DevExpress.require('__internal/grids/tree_list/m_core'), null, - DevExpress.require('core/utils/dom'), - DevExpress.require('core/utils/common'), - DevExpress.require('core/utils/type'), + DevExpress.require('__internal/core/utils/m_dom'), + DevExpress.require('__internal/core/utils/m_common'), + DevExpress.require('__internal/core/utils/m_type'), DevExpress.require('data/array_store'), 'TreeList' )); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js index db32def32d51..d942925e548d 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import domUtils from 'core/utils/dom'; +import domUtils from '__internal/core/utils/m_dom'; import support from '__internal/core/utils/m_support'; import styleUtils from 'core/utils/style'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js index d10f65bc78bc..96c105041037 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { DataSource } from 'data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; -import { createTextElementHiddenCopy } from 'core/utils/dom'; +import { createTextElementHiddenCopy } from '__internal/core/utils/m_dom'; import ajaxMock from '../../helpers/ajaxMock.js'; import config from 'core/config'; import dataQuery from 'data/query'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js index d50b9d0b340a..ff593fc69dac 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js @@ -2,7 +2,7 @@ import animationFrame from 'animation/frame'; import { getTranslateValues } from 'renovation/ui/scroll_view/utils/get_translate_values'; import 'generic_light.css!'; import devices from '__internal/core/m_devices'; -import domUtils from 'core/utils/dom'; +import domUtils from '__internal/core/utils/m_dom'; import styleUtils from 'core/utils/style'; import support from '__internal/core/utils/m_support'; import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change';