diff --git a/packages/devextreme/js/__internal/core/m_action.ts b/packages/devextreme/js/__internal/core/m_action.ts index e8e2a5622fe7..13690cdfc35b 100644 --- a/packages/devextreme/js/__internal/core/m_action.ts +++ b/packages/devextreme/js/__internal/core/m_action.ts @@ -144,11 +144,11 @@ const createValidatorByTargetElement = (condition) => (e) => { // @ts-expect-error expect name and executor Action.registerExecutor({ disabled: { - validate: createValidatorByTargetElement(($target) => $target.is('@js/coredx-state-disabled, .dx-state-disabled *')), + validate: createValidatorByTargetElement(($target) => $target.is('.dx-state-disabled, .dx-state-disabled *')), }, readOnly: { - validate: createValidatorByTargetElement(($target) => $target.is('@js/coredx-state-readonly, .dx-state-readonly *:not(.dx-state-independent)')), + validate: createValidatorByTargetElement(($target) => $target.is('.dx-state-readonly, .dx-state-readonly *:not(.dx-state-independent)')), }, undefined: { execute: (e) => { diff --git a/packages/devextreme/js/__internal/core/m_config.ts b/packages/devextreme/js/__internal/core/m_config.ts index 61237342052b..4532433c9216 100644 --- a/packages/devextreme/js/__internal/core/m_config.ts +++ b/packages/devextreme/js/__internal/core/m_config.ts @@ -8,8 +8,8 @@ const config = { defaultCurrency: 'USD', defaultUseCurrencyAccountingStyle: true, oDataFilterToLower: true, - serverDecimalSeparator: '@js/core', - decimalSeparator: '@js/core', + serverDecimalSeparator: '.', + decimalSeparator: '.', thousandsSeparator: ',', forceIsoDateParsing: true, wrapActionsBeforeExecute: true, diff --git a/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts b/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts index 45792ca211ab..09ffd2877370 100644 --- a/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts +++ b/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts @@ -10,7 +10,7 @@ const DATETIME_SERIALIZATION_FORMAT = 'yyyy/MM/dd HH:mm:ss'; const ISO8601_PATTERN = /^(\d{4,})(-)?(\d{2})(-)?(\d{2})(?:T(\d{2})(:)?(\d{2})?(:)?(\d{2}(?:\.(\d{1,3})\d*)?)?)?(Z|([+-])(\d{2})(:)?(\d{2})?)?$/; const ISO8601_TIME_PATTERN = /^(\d{2}):(\d{2})(:(\d{2}))?$/; -const ISO8601_PATTERN_PARTS = ['', 'yyyy', '', 'MM', '', 'dd', 'THH', '', 'mm', '', 'ss', '@js/core/utilsSSS']; +const ISO8601_PATTERN_PARTS = ['', 'yyyy', '', 'MM', '', 'dd', 'THH', '', 'mm', '', 'ss', '.SSS']; const DATE_SERIALIZATION_PATTERN = /^(\d{4})\/(\d{2})\/(\d{2})$/; const MILLISECOND_LENGHT = 3; diff --git a/packages/devextreme/js/__internal/core/utils/m_error.ts b/packages/devextreme/js/__internal/core/utils/m_error.ts index 92ca1af56213..252f307ffbb6 100644 --- a/packages/devextreme/js/__internal/core/utils/m_error.ts +++ b/packages/devextreme/js/__internal/core/utils/m_error.ts @@ -4,7 +4,7 @@ import { extend } from '@js/core/utils/extend'; import { format } from '@js/core/utils/string'; import { version } from '@js/core/version'; -const ERROR_URL = `https://js.devexpress.com/error/${version.split('@js/core/utils').slice(0, 2).join('_')}/`; +const ERROR_URL = `https://js.devexpress.com/error/${version.split('.').slice(0, 2).join('_')}/`; function error(baseErrors, errors?) { const exports = { diff --git a/packages/devextreme/js/__internal/core/utils/m_inflector.ts b/packages/devextreme/js/__internal/core/utils/m_inflector.ts index f8f417be6412..6f077391e7c0 100644 --- a/packages/devextreme/js/__internal/core/utils/m_inflector.ts +++ b/packages/devextreme/js/__internal/core/utils/m_inflector.ts @@ -55,7 +55,7 @@ export const captionize = function (name) { for (i = 0; i < name.length; i++) { char = name.charAt(i); isNewWord = (char === char.toUpperCase() && char !== '-' && char !== ')' && char !== '/') || (char in DIGIT_CHARS); - if (char === '_' || char === '@js/core/utils') { + if (char === '_' || char === '.') { char = ' '; isNewWord = true; } else if (i === 0) { diff --git a/packages/devextreme/js/__internal/core/utils/m_math.ts b/packages/devextreme/js/__internal/core/utils/m_math.ts index f259edf09843..f4745378b13e 100644 --- a/packages/devextreme/js/__internal/core/utils/m_math.ts +++ b/packages/devextreme/js/__internal/core/utils/m_math.ts @@ -54,7 +54,7 @@ function isEdgeBug() { function adjust(value, interval) { let precision = getPrecision(interval || 0) + 2; - const separatedValue = value.toString().split('@js/core/utils'); + const separatedValue = value.toString().split('.'); const sourceValue = value; const absValue = Math.abs(value); let separatedAdjustedValue; @@ -76,7 +76,7 @@ function adjust(value, interval) { precision = (isEdgeBug() && (getExponent(value) > 6)) || precision > 7 ? 15 : 7; // fix toPrecision() bug in Edge (T570217) if (!isExponentValue) { - separatedAdjustedValue = parseFloat(value.toPrecision(precision)).toString().split('@js/core/utils'); + separatedAdjustedValue = parseFloat(value.toPrecision(precision)).toString().split('.'); if (separatedAdjustedValue[0] === integerPart.toString()) { return parseFloat(`${separatedValue[0]}.${separatedAdjustedValue[1]}`); } @@ -87,11 +87,11 @@ function adjust(value, interval) { function getPrecision(value) { const str = value.toString(); - if (str.indexOf('@js/core/utils') < 0) { + if (str.indexOf('.') < 0) { return 0; } - const mantissa = str.split('@js/core/utils'); + const mantissa = str.split('.'); const positionOfDelimiter = mantissa[1].indexOf('e'); return positionOfDelimiter >= 0 ? positionOfDelimiter : mantissa[1].length; @@ -175,7 +175,7 @@ function getRemainderByDivision(dividend, divider, digitsCount) { function getExponentLength(value) { const valueString = value.toString(); - return valueString.split('@js/core/utils')[1]?.length + return valueString.split('.')[1]?.length || parseInt(valueString.split('e-')[1], 10) || 0; } diff --git a/packages/devextreme/js/__internal/core/utils/m_view_port.ts b/packages/devextreme/js/__internal/core/utils/m_view_port.ts index e41b7dc38312..7c21fb978506 100644 --- a/packages/devextreme/js/__internal/core/utils/m_view_port.ts +++ b/packages/devextreme/js/__internal/core/utils/m_view_port.ts @@ -24,7 +24,7 @@ const value = (function (...args) { }()); ready(() => { - value('@js/core/utilsdx-viewport'); + value('.dx-viewport'); }); export {