') }).text()) === text) {
+ if(this.render({ model: {}, container: $('
') }).text().trim() === text) {
disposed = true;
}
};
From d2116929f6e22e22452cc5f47d9027e3442ab41e Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:24:41 +0300
Subject: [PATCH 12/20] $.isArray -> Array.isArray (13 occ, 9 files)
---
packages/devextreme/testing/helpers/nativePointerMock.js | 2 +-
packages/devextreme/testing/helpers/pointerMock.js | 2 +-
.../dataController.tests.js | 8 ++++----
.../DevExpress.ui.widgets.dataGrid/dataSource.tests.js | 2 +-
.../DevExpress.ui.widgets.editors/fileUploader.tests.js | 2 +-
.../tests/DevExpress.ui.widgets.scheduler/common.tests.js | 2 +-
.../testing/tests/DevExpress.ui.widgets/menuBase.tests.js | 4 ++--
.../testing/tests/DevExpress.ui/defaultOptions.tests.js | 2 +-
.../hierarchicalDataAdapter.js | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/packages/devextreme/testing/helpers/nativePointerMock.js b/packages/devextreme/testing/helpers/nativePointerMock.js
index 6a86704bcc76..d0faea15e121 100644
--- a/packages/devextreme/testing/helpers/nativePointerMock.js
+++ b/packages/devextreme/testing/helpers/nativePointerMock.js
@@ -921,7 +921,7 @@
},
move: function(x, y) {
- if($.isArray(x)) {
+ if(Array.isArray(x)) {
this.move.apply(this, x);
} else {
this.touchMove(x, y);
diff --git a/packages/devextreme/testing/helpers/pointerMock.js b/packages/devextreme/testing/helpers/pointerMock.js
index dc7229b41a08..2f1e2390460f 100644
--- a/packages/devextreme/testing/helpers/pointerMock.js
+++ b/packages/devextreme/testing/helpers/pointerMock.js
@@ -87,7 +87,7 @@
},
move: function(x, y) {
- if($.isArray(x)) {
+ if(Array.isArray(x)) {
this.move.apply(this, x);
} else {
_x += x || 0;
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js
index 4c8f74f96489..f1b99abd7857 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js
@@ -6877,15 +6877,15 @@ QUnit.module('Filtering', {
// assert
filter = this.getCombinedFilter();
- assert.ok($.isArray(filter[0]), 'first argument is filter expression');
+ assert.ok(Array.isArray(filter[0]), 'first argument is filter expression');
assert.strictEqual(filter[1], 'and', 'second argument is operation \'and\'');
- assert.ok($.isArray(filter[2]), 'third argument is filter expression');
+ assert.ok(Array.isArray(filter[2]), 'third argument is filter expression');
assert.ok($.isFunction(filter[0][0]), 'filter expression selector is function');
filter = this.getCombinedFilter(true);
- assert.ok($.isArray(filter[0]), 'first argument is filter expression');
+ assert.ok(Array.isArray(filter[0]), 'first argument is filter expression');
assert.strictEqual(filter[1], 'and', 'second argument is operation \'and\'');
- assert.ok($.isArray(filter[2]), 'third argument is filter expression');
+ assert.ok(Array.isArray(filter[2]), 'third argument is filter expression');
assert.equal(filter.length, 3, 'filter expression + \'and\' + \'filter expression\'');
assert.ok(!$.isFunction(filter[2][0]), 'filter expression selector isn\'t function');
assert.strictEqual(filter[0][0], 'name', 'value of the selector');
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js
index 6cf38d965b14..113798e5b723 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js
@@ -2646,7 +2646,7 @@ QUnit.module('Grouping with basic remoteOperations. Second level', {
});
function createDataSourceWithRemoteGrouping(options, remoteGroupPaging, brokeOptions) {
- if($.isArray(options.store) || (options.store && options.store.type === 'array') || options.load) {
+ if(Array.isArray(options.store) || (options.store && options.store.type === 'array') || options.load) {
const arrayStore = new ArrayStore(options.store || []);
options.executeAsync = options.executeAsync || function(func) { func(); };
brokeOptions = brokeOptions || {};
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js
index 0dd8efa91ea3..fb5bc031e529 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js
@@ -46,7 +46,7 @@ const FILEUPLOADER_AFTER_LOAD_DELAY = 500;
const simulateFileChoose = function($fileUploader, files) {
const $input = $fileUploader.find('.' + FILEUPLOADER_INPUT_CLASS);
- files = $.isArray(files) ? files : [files];
+ files = Array.isArray(files) ? files : [files];
if($.isPlainObject(files[0])) {
$input.val(files[0].name);
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js
index f06fc99c4f45..f7efdbce939b 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js
@@ -119,7 +119,7 @@ QUnit.module('Filtering', () => {
const dateFilter = filter[0][0];
const zeroDurationFilter = filter[0][4];
- assert.ok($.isArray(filter), 'Filter is array');
+ assert.ok(Array.isArray(filter), 'Filter is array');
assert.equal(filter[0].length, 5, 'Filter size is OK');
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menuBase.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menuBase.tests.js
index 421f257b3f10..c1674770844c 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menuBase.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menuBase.tests.js
@@ -960,8 +960,8 @@ QUnit.module('Selection', () => {
onSelectionChanged: function(e) {
assert.equal(e.component, this, 'e.component should be an instance of menu');
assert.ok($(e.element).get(0).nodeType, 'e.element should be dom node or jquery object');
- assert.ok($.isArray(e.addedItems), 'e.addedItems should be array');
- assert.ok($.isArray(e.removedItems), 'e.removedItems should be array');
+ assert.ok(Array.isArray(e.addedItems), 'e.addedItems should be array');
+ assert.ok(Array.isArray(e.removedItems), 'e.removedItems should be array');
}
});
const $item = menuBase.element.find('.' + DX_MENU_ITEM_CLASS).eq(1);
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
index 924cb2480901..f02c639c264c 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
@@ -79,7 +79,7 @@ QUnit.module('widgets defaults');
const testComponentDefaults = function(componentClass, forcedDevices, options, before, after) {
const componentName = publicComponentUtils.name(componentClass);
- forcedDevices = $.isArray(forcedDevices) ? forcedDevices : [forcedDevices];
+ forcedDevices = Array.isArray(forcedDevices) ? forcedDevices : [forcedDevices];
before = before || noop;
after = after || noop;
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js
index 27347eabf7a1..a817b411e18d 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js
@@ -897,7 +897,7 @@ module('Search operation', moduleConfig, () => {
const result = dataAdapter.search('bla-bla-bla');
- assert.ok($.isArray(result), 'The result is array');
+ assert.ok(Array.isArray(result), 'The result is array');
assert.equal(result.length, 0, 'The result is empty');
});
From a8262573bdd2566ebce87cc3cf926e135b8feebd Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:47:25 +0200
Subject: [PATCH 13/20] $.isWindow -> core/utils/type/isWindow
---
.../testing/tests/DevExpress.ui.widgets/popup.tests.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js
index d9128546d2c1..57f2c8b4fa5c 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js
@@ -15,7 +15,7 @@ import { value as viewPort } from 'core/utils/view_port';
import pointerMock from '../../helpers/pointerMock.js';
import keyboardMock from '../../helpers/keyboardMock.js';
import config from 'core/config';
-import { isRenderer } from 'core/utils/type';
+import { isRenderer, isWindow } from 'core/utils/type';
import browser from 'core/utils/browser';
import { compare as compareVersions } from 'core/utils/version';
import resizeCallbacks from 'core/utils/resize_callbacks';
@@ -2294,7 +2294,7 @@ QUnit.module('resize', {
this.reinit({ width: 2, height: 2 });
const resizable = this.$overlayContent.dxResizable('instance');
- assert.ok($.isWindow(resizable.option('area').get(0)), 'window is the area of the resizable');
+ assert.ok(isWindow(resizable.option('area').get(0)), 'window is the area of the resizable');
} finally {
viewPort(toSelector(VIEWPORT_CLASS));
}
From 2ac74181e9dcfcfd33695ccd9a36ad9d1bf772de Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Mon, 28 Oct 2024 22:03:23 +0200
Subject: [PATCH 14/20] $.isNumeric -> core/utils/type/isNumeric
---
.../testing/helpers/nativePointerMock.js | 47 ++++++++++---------
.../utils.animationFrame.tests.js | 3 +-
.../common.part3.tests.js | 5 +-
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/packages/devextreme/testing/helpers/nativePointerMock.js b/packages/devextreme/testing/helpers/nativePointerMock.js
index d0faea15e121..3ae8ec0c7c3b 100644
--- a/packages/devextreme/testing/helpers/nativePointerMock.js
+++ b/packages/devextreme/testing/helpers/nativePointerMock.js
@@ -40,6 +40,7 @@
const isString = function(val) { return typeof val === 'string'; };
const isBoolean = function(val) { return typeof val === 'boolean'; };
const isObject = function(val) { return typeof val === 'object'; };
+ const isNumeric = function(val) { return typeof val === 'number'; };
const MOUSE_EVENTS = {
'click': 1,
@@ -151,11 +152,11 @@
metaKey = false;
}
- if(!$.isNumeric(keyCode)) {
+ if(!isNumeric(keyCode)) {
keyCode = 0;
}
- if(!$.isNumeric(charCode)) {
+ if(!isNumeric(charCode)) {
charCode = 0;
}
@@ -222,23 +223,23 @@
view = window;
}
- if(!$.isNumeric(detail)) {
+ if(!isNumeric(detail)) {
detail = 1;
}
- if(!$.isNumeric(screenX)) {
+ if(!isNumeric(screenX)) {
screenX = 0;
}
- if(!$.isNumeric(screenY)) {
+ if(!isNumeric(screenY)) {
screenY = 0;
}
- if(!$.isNumeric(clientX)) {
+ if(!isNumeric(clientX)) {
clientX = 0;
}
- if(!$.isNumeric(clientY)) {
+ if(!isNumeric(clientY)) {
clientY = 0;
}
@@ -258,7 +259,7 @@
metaKey = false;
}
- if(!$.isNumeric(button)) {
+ if(!isNumeric(button)) {
button = 0;
}
@@ -325,7 +326,7 @@
if(!isObject(view)) {
view = window;
- if(!$.isNumeric(detail)) {
+ if(!isNumeric(detail)) {
detail = 1;
if($.isFunction(document.createEvent)) {
@@ -366,18 +367,18 @@
if(!isBoolean(bubbles)) { bubbles = true; }
if(!isBoolean(cancelable)) { cancelable = true; }
if(!isObject(view)) { view = window; }
- if(!$.isNumeric(detail)) { detail = 2; }
- if(!$.isNumeric(screenX)) { screenX = 0; }
- if(!$.isNumeric(screenY)) { screenY = 0; }
- if(!$.isNumeric(clientX)) { clientX = 0; }
- if(!$.isNumeric(clientY)) { clientY = 0; }
+ if(!isNumeric(detail)) { detail = 2; }
+ if(!isNumeric(screenX)) { screenX = 0; }
+ if(!isNumeric(screenY)) { screenY = 0; }
+ if(!isNumeric(clientX)) { clientX = 0; }
+ if(!isNumeric(clientY)) { clientY = 0; }
if(!isBoolean(ctrlKey)) { ctrlKey = false; }
if(!isBoolean(altKey)) { altKey = false; }
if(!isBoolean(shiftKey)) { shiftKey = false; }
if(!isBoolean(metaKey)) { metaKey = false; }
- if(!$.isNumeric(scale)) { scale = 1.0; }
- if(!$.isNumeric(rotation)) { rotation = 0.0; }
+ if(!isNumeric(scale)) { scale = 1.0; }
+ if(!isNumeric(rotation)) { rotation = 0.0; }
const customEvent = document.createEvent('GestureEvent');
@@ -421,17 +422,17 @@
cancelable = (type !== 'touchcancel');
}
if(!isObject(view)) { view = window; }
- if(!$.isNumeric(detail)) { detail = 1; }
- if(!$.isNumeric(screenX)) { screenX = 0; }
- if(!$.isNumeric(screenY)) { screenY = 0; }
- if(!$.isNumeric(clientX)) { clientX = 0; }
- if(!$.isNumeric(clientY)) { clientY = 0; }
+ if(!isNumeric(detail)) { detail = 1; }
+ if(!isNumeric(screenX)) { screenX = 0; }
+ if(!isNumeric(screenY)) { screenY = 0; }
+ if(!isNumeric(clientX)) { clientX = 0; }
+ if(!isNumeric(clientY)) { clientY = 0; }
if(!isBoolean(ctrlKey)) { ctrlKey = false; }
if(!isBoolean(altKey)) { altKey = false; }
if(!isBoolean(shiftKey)) { shiftKey = false; }
if(!isBoolean(metaKey)) { metaKey = false; }
- if(!$.isNumeric(scale)) { scale = 1.0; }
- if(!$.isNumeric(rotation)) { rotation = 0.0; }
+ if(!isNumeric(scale)) { scale = 1.0; }
+ if(!isNumeric(rotation)) { rotation = 0.0; }
if(UA.android && !UA.chrome) {
customEvent = document.createEvent('MouseEvents');
diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
index d9f77af4f661..76e239004eda 100644
--- a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
@@ -1,5 +1,6 @@
const $ = require('jquery');
const animationFrame = require('animation/frame');
+const coreUtilsType = require('core/utils/type');
QUnit.module('animation frame');
@@ -8,7 +9,7 @@ QUnit.testInActiveWindow('request', function(assert) {
const animationFrameID = animationFrame.requestAnimationFrame(function() {
done();
});
- assert.ok($.isNumeric(animationFrameID));
+ assert.ok(coreUtilsType.isNumeric(animationFrameID));
});
QUnit.testInActiveWindow('cancel', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
index 45ccd3a191d7..f3f4cd71da2e 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
@@ -1,4 +1,5 @@
import { setHeight, getHeight } from 'core/utils/size';
+import { isNumeric } from 'core/utils/type';
import $ from 'jquery';
import { DEBUG_stub_createIncidentOccurred, DEBUG_restore_createIncidentOccurred } from 'viz/core/base_widget.utils';
import commons from './rangeSelectorParts/commons.js';
@@ -98,8 +99,8 @@ QUnit.test('check default value valueType when start value is numeric', function
});
const options = this.axis.updateOptions.lastCall.args[0];
- assert.ok($.isNumeric(options.startValue));
- assert.ok($.isNumeric(options.endValue));
+ assert.ok(isNumeric(options.startValue));
+ assert.ok(isNumeric(options.endValue));
assert.strictEqual(options.valueType, 'numeric');
});
From 6a30025795694a4bfc82de04c10bf9efc564c755 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 29 Oct 2024 00:12:18 +0200
Subject: [PATCH 15/20] Revert "$.isNumeric -> core/utils/type/isNumeric"
This reverts commit 2ac74181e9dcfcfd33695ccd9a36ad9d1bf772de.
---
.../testing/helpers/nativePointerMock.js | 47 +++++++++----------
.../utils.animationFrame.tests.js | 3 +-
.../common.part3.tests.js | 5 +-
3 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/packages/devextreme/testing/helpers/nativePointerMock.js b/packages/devextreme/testing/helpers/nativePointerMock.js
index 3ae8ec0c7c3b..d0faea15e121 100644
--- a/packages/devextreme/testing/helpers/nativePointerMock.js
+++ b/packages/devextreme/testing/helpers/nativePointerMock.js
@@ -40,7 +40,6 @@
const isString = function(val) { return typeof val === 'string'; };
const isBoolean = function(val) { return typeof val === 'boolean'; };
const isObject = function(val) { return typeof val === 'object'; };
- const isNumeric = function(val) { return typeof val === 'number'; };
const MOUSE_EVENTS = {
'click': 1,
@@ -152,11 +151,11 @@
metaKey = false;
}
- if(!isNumeric(keyCode)) {
+ if(!$.isNumeric(keyCode)) {
keyCode = 0;
}
- if(!isNumeric(charCode)) {
+ if(!$.isNumeric(charCode)) {
charCode = 0;
}
@@ -223,23 +222,23 @@
view = window;
}
- if(!isNumeric(detail)) {
+ if(!$.isNumeric(detail)) {
detail = 1;
}
- if(!isNumeric(screenX)) {
+ if(!$.isNumeric(screenX)) {
screenX = 0;
}
- if(!isNumeric(screenY)) {
+ if(!$.isNumeric(screenY)) {
screenY = 0;
}
- if(!isNumeric(clientX)) {
+ if(!$.isNumeric(clientX)) {
clientX = 0;
}
- if(!isNumeric(clientY)) {
+ if(!$.isNumeric(clientY)) {
clientY = 0;
}
@@ -259,7 +258,7 @@
metaKey = false;
}
- if(!isNumeric(button)) {
+ if(!$.isNumeric(button)) {
button = 0;
}
@@ -326,7 +325,7 @@
if(!isObject(view)) {
view = window;
- if(!isNumeric(detail)) {
+ if(!$.isNumeric(detail)) {
detail = 1;
if($.isFunction(document.createEvent)) {
@@ -367,18 +366,18 @@
if(!isBoolean(bubbles)) { bubbles = true; }
if(!isBoolean(cancelable)) { cancelable = true; }
if(!isObject(view)) { view = window; }
- if(!isNumeric(detail)) { detail = 2; }
- if(!isNumeric(screenX)) { screenX = 0; }
- if(!isNumeric(screenY)) { screenY = 0; }
- if(!isNumeric(clientX)) { clientX = 0; }
- if(!isNumeric(clientY)) { clientY = 0; }
+ if(!$.isNumeric(detail)) { detail = 2; }
+ if(!$.isNumeric(screenX)) { screenX = 0; }
+ if(!$.isNumeric(screenY)) { screenY = 0; }
+ if(!$.isNumeric(clientX)) { clientX = 0; }
+ if(!$.isNumeric(clientY)) { clientY = 0; }
if(!isBoolean(ctrlKey)) { ctrlKey = false; }
if(!isBoolean(altKey)) { altKey = false; }
if(!isBoolean(shiftKey)) { shiftKey = false; }
if(!isBoolean(metaKey)) { metaKey = false; }
- if(!isNumeric(scale)) { scale = 1.0; }
- if(!isNumeric(rotation)) { rotation = 0.0; }
+ if(!$.isNumeric(scale)) { scale = 1.0; }
+ if(!$.isNumeric(rotation)) { rotation = 0.0; }
const customEvent = document.createEvent('GestureEvent');
@@ -422,17 +421,17 @@
cancelable = (type !== 'touchcancel');
}
if(!isObject(view)) { view = window; }
- if(!isNumeric(detail)) { detail = 1; }
- if(!isNumeric(screenX)) { screenX = 0; }
- if(!isNumeric(screenY)) { screenY = 0; }
- if(!isNumeric(clientX)) { clientX = 0; }
- if(!isNumeric(clientY)) { clientY = 0; }
+ if(!$.isNumeric(detail)) { detail = 1; }
+ if(!$.isNumeric(screenX)) { screenX = 0; }
+ if(!$.isNumeric(screenY)) { screenY = 0; }
+ if(!$.isNumeric(clientX)) { clientX = 0; }
+ if(!$.isNumeric(clientY)) { clientY = 0; }
if(!isBoolean(ctrlKey)) { ctrlKey = false; }
if(!isBoolean(altKey)) { altKey = false; }
if(!isBoolean(shiftKey)) { shiftKey = false; }
if(!isBoolean(metaKey)) { metaKey = false; }
- if(!isNumeric(scale)) { scale = 1.0; }
- if(!isNumeric(rotation)) { rotation = 0.0; }
+ if(!$.isNumeric(scale)) { scale = 1.0; }
+ if(!$.isNumeric(rotation)) { rotation = 0.0; }
if(UA.android && !UA.chrome) {
customEvent = document.createEvent('MouseEvents');
diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
index 76e239004eda..d9f77af4f661 100644
--- a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
@@ -1,6 +1,5 @@
const $ = require('jquery');
const animationFrame = require('animation/frame');
-const coreUtilsType = require('core/utils/type');
QUnit.module('animation frame');
@@ -9,7 +8,7 @@ QUnit.testInActiveWindow('request', function(assert) {
const animationFrameID = animationFrame.requestAnimationFrame(function() {
done();
});
- assert.ok(coreUtilsType.isNumeric(animationFrameID));
+ assert.ok($.isNumeric(animationFrameID));
});
QUnit.testInActiveWindow('cancel', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
index f3f4cd71da2e..45ccd3a191d7 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
@@ -1,5 +1,4 @@
import { setHeight, getHeight } from 'core/utils/size';
-import { isNumeric } from 'core/utils/type';
import $ from 'jquery';
import { DEBUG_stub_createIncidentOccurred, DEBUG_restore_createIncidentOccurred } from 'viz/core/base_widget.utils';
import commons from './rangeSelectorParts/commons.js';
@@ -99,8 +98,8 @@ QUnit.test('check default value valueType when start value is numeric', function
});
const options = this.axis.updateOptions.lastCall.args[0];
- assert.ok(isNumeric(options.startValue));
- assert.ok(isNumeric(options.endValue));
+ assert.ok($.isNumeric(options.startValue));
+ assert.ok($.isNumeric(options.endValue));
assert.strictEqual(options.valueType, 'numeric');
});
From 336b113ca4105777ca91a2b58c329ecf31deaa4a Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 29 Oct 2024 00:14:13 +0200
Subject: [PATCH 16/20] Revert "Revert "$.isNumeric ->
core/utils/type/isNumeric"" (+ rename import to "typeUtils" like for other
tests)
This reverts commit 6a30025795694a4bfc82de04c10bf9efc564c755.
---
.../testing/helpers/nativePointerMock.js | 47 ++++++++++---------
.../utils.animationFrame.tests.js | 3 +-
.../common.part3.tests.js | 5 +-
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/packages/devextreme/testing/helpers/nativePointerMock.js b/packages/devextreme/testing/helpers/nativePointerMock.js
index d0faea15e121..3ae8ec0c7c3b 100644
--- a/packages/devextreme/testing/helpers/nativePointerMock.js
+++ b/packages/devextreme/testing/helpers/nativePointerMock.js
@@ -40,6 +40,7 @@
const isString = function(val) { return typeof val === 'string'; };
const isBoolean = function(val) { return typeof val === 'boolean'; };
const isObject = function(val) { return typeof val === 'object'; };
+ const isNumeric = function(val) { return typeof val === 'number'; };
const MOUSE_EVENTS = {
'click': 1,
@@ -151,11 +152,11 @@
metaKey = false;
}
- if(!$.isNumeric(keyCode)) {
+ if(!isNumeric(keyCode)) {
keyCode = 0;
}
- if(!$.isNumeric(charCode)) {
+ if(!isNumeric(charCode)) {
charCode = 0;
}
@@ -222,23 +223,23 @@
view = window;
}
- if(!$.isNumeric(detail)) {
+ if(!isNumeric(detail)) {
detail = 1;
}
- if(!$.isNumeric(screenX)) {
+ if(!isNumeric(screenX)) {
screenX = 0;
}
- if(!$.isNumeric(screenY)) {
+ if(!isNumeric(screenY)) {
screenY = 0;
}
- if(!$.isNumeric(clientX)) {
+ if(!isNumeric(clientX)) {
clientX = 0;
}
- if(!$.isNumeric(clientY)) {
+ if(!isNumeric(clientY)) {
clientY = 0;
}
@@ -258,7 +259,7 @@
metaKey = false;
}
- if(!$.isNumeric(button)) {
+ if(!isNumeric(button)) {
button = 0;
}
@@ -325,7 +326,7 @@
if(!isObject(view)) {
view = window;
- if(!$.isNumeric(detail)) {
+ if(!isNumeric(detail)) {
detail = 1;
if($.isFunction(document.createEvent)) {
@@ -366,18 +367,18 @@
if(!isBoolean(bubbles)) { bubbles = true; }
if(!isBoolean(cancelable)) { cancelable = true; }
if(!isObject(view)) { view = window; }
- if(!$.isNumeric(detail)) { detail = 2; }
- if(!$.isNumeric(screenX)) { screenX = 0; }
- if(!$.isNumeric(screenY)) { screenY = 0; }
- if(!$.isNumeric(clientX)) { clientX = 0; }
- if(!$.isNumeric(clientY)) { clientY = 0; }
+ if(!isNumeric(detail)) { detail = 2; }
+ if(!isNumeric(screenX)) { screenX = 0; }
+ if(!isNumeric(screenY)) { screenY = 0; }
+ if(!isNumeric(clientX)) { clientX = 0; }
+ if(!isNumeric(clientY)) { clientY = 0; }
if(!isBoolean(ctrlKey)) { ctrlKey = false; }
if(!isBoolean(altKey)) { altKey = false; }
if(!isBoolean(shiftKey)) { shiftKey = false; }
if(!isBoolean(metaKey)) { metaKey = false; }
- if(!$.isNumeric(scale)) { scale = 1.0; }
- if(!$.isNumeric(rotation)) { rotation = 0.0; }
+ if(!isNumeric(scale)) { scale = 1.0; }
+ if(!isNumeric(rotation)) { rotation = 0.0; }
const customEvent = document.createEvent('GestureEvent');
@@ -421,17 +422,17 @@
cancelable = (type !== 'touchcancel');
}
if(!isObject(view)) { view = window; }
- if(!$.isNumeric(detail)) { detail = 1; }
- if(!$.isNumeric(screenX)) { screenX = 0; }
- if(!$.isNumeric(screenY)) { screenY = 0; }
- if(!$.isNumeric(clientX)) { clientX = 0; }
- if(!$.isNumeric(clientY)) { clientY = 0; }
+ if(!isNumeric(detail)) { detail = 1; }
+ if(!isNumeric(screenX)) { screenX = 0; }
+ if(!isNumeric(screenY)) { screenY = 0; }
+ if(!isNumeric(clientX)) { clientX = 0; }
+ if(!isNumeric(clientY)) { clientY = 0; }
if(!isBoolean(ctrlKey)) { ctrlKey = false; }
if(!isBoolean(altKey)) { altKey = false; }
if(!isBoolean(shiftKey)) { shiftKey = false; }
if(!isBoolean(metaKey)) { metaKey = false; }
- if(!$.isNumeric(scale)) { scale = 1.0; }
- if(!$.isNumeric(rotation)) { rotation = 0.0; }
+ if(!isNumeric(scale)) { scale = 1.0; }
+ if(!isNumeric(rotation)) { rotation = 0.0; }
if(UA.android && !UA.chrome) {
customEvent = document.createEvent('MouseEvents');
diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
index d9f77af4f661..da5a0cc0eac7 100644
--- a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js
@@ -1,5 +1,6 @@
const $ = require('jquery');
const animationFrame = require('animation/frame');
+const typeUtils = require('core/utils/type');
QUnit.module('animation frame');
@@ -8,7 +9,7 @@ QUnit.testInActiveWindow('request', function(assert) {
const animationFrameID = animationFrame.requestAnimationFrame(function() {
done();
});
- assert.ok($.isNumeric(animationFrameID));
+ assert.ok(typeUtils.isNumeric(animationFrameID));
});
QUnit.testInActiveWindow('cancel', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
index 45ccd3a191d7..f3f4cd71da2e 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js
@@ -1,4 +1,5 @@
import { setHeight, getHeight } from 'core/utils/size';
+import { isNumeric } from 'core/utils/type';
import $ from 'jquery';
import { DEBUG_stub_createIncidentOccurred, DEBUG_restore_createIncidentOccurred } from 'viz/core/base_widget.utils';
import commons from './rangeSelectorParts/commons.js';
@@ -98,8 +99,8 @@ QUnit.test('check default value valueType when start value is numeric', function
});
const options = this.axis.updateOptions.lastCall.args[0];
- assert.ok($.isNumeric(options.startValue));
- assert.ok($.isNumeric(options.endValue));
+ assert.ok(isNumeric(options.startValue));
+ assert.ok(isNumeric(options.endValue));
assert.strictEqual(options.valueType, 'numeric');
});
From 37532ee92cea720a9d948d7278952269ca5eda2a Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 29 Oct 2024 00:44:23 +0200
Subject: [PATCH 17/20] $.isFunction -> core/utils/type/isFunction
---
.../Charts/SignalRService/signalr-hub.js | 4 +-
.../DataGrid/SignalRService/signalr-hub.js | 4 +-
.../testing/helpers/gridBaseMocks.js | 2 +-
.../testing/helpers/nativePointerMock.js | 3 +-
.../devextreme/testing/helpers/vizMocks.js | 14 +++--
.../testing/helpers/widgetsIterator.js | 3 +-
.../eventRegistrator.tests.js | 5 +-
.../DevExpress.knockout/dataGrid.tests.js | 3 +-
.../sharedParts/localization.shared.js | 3 +-
.../eventRegistrator.tests.js | 5 +-
.../pointerParts/baseTests.js | 3 +-
.../columnsController.tests.js | 2 +-
.../dataController.tests.js | 4 +-
.../dataGrid.tests.js | 2 +-
.../headerFilter.tests.js | 5 +-
.../lookup.tests.js | 10 +--
.../tagBox.tests.js | 4 +-
.../chartIntegration.tests.js | 3 +-
.../common.initialization.tests.js | 5 +-
.../contextMenu.tests.js | 6 +-
.../listParts/commonTests.js | 8 +--
.../DevExpress.ui.widgets/treeView.tests.js | 3 +-
.../DevExpress.ui/defaultOptions.tests.js | 5 +-
.../tests/DevExpress.ui/widget.tests.js | 5 +-
.../chart.part1.tests.js | 5 +-
.../chart.part3.tests.js | 3 +-
.../DevExpress.viz.charts/pieChart.tests.js | 3 +-
.../DevExpress.viz.core/translator2D.tests.js | 61 ++++++++++---------
.../Animation.tests.js | 10 +--
.../sparkline.tests.js | 3 +-
30 files changed, 110 insertions(+), 86 deletions(-)
diff --git a/apps/demos/Demos/Charts/SignalRService/signalr-hub.js b/apps/demos/Demos/Charts/SignalRService/signalr-hub.js
index 98bdc87e542e..a5d207a65bb3 100644
--- a/apps/demos/Demos/Charts/SignalRService/signalr-hub.js
+++ b/apps/demos/Demos/Charts/SignalRService/signalr-hub.js
@@ -14,6 +14,8 @@
///
"use strict";
+ var isFunction = function(val) { return typeof val === 'function'; };
+
if (typeof ($.signalR) !== "function") {
throw new Error("SignalR: SignalR is not loaded. Please ensure jquery.signalR-x.js is referenced before ~/signalr/js.");
}
@@ -52,7 +54,7 @@
if (hub.client.hasOwnProperty(memberKey)) {
memberValue = hub.client[memberKey];
- if (!$.isFunction(memberValue)) {
+ if (!isFunction(memberValue)) {
// Not a client hub function
continue;
}
diff --git a/apps/demos/Demos/DataGrid/SignalRService/signalr-hub.js b/apps/demos/Demos/DataGrid/SignalRService/signalr-hub.js
index e547fbb26888..0d6e373c93e8 100644
--- a/apps/demos/Demos/DataGrid/SignalRService/signalr-hub.js
+++ b/apps/demos/Demos/DataGrid/SignalRService/signalr-hub.js
@@ -15,6 +15,8 @@
///
"use strict";
+ var isFunction = function(val) { return typeof val === 'function'; };
+
if (typeof ($.signalR) !== "function") {
throw new Error("SignalR: SignalR is not loaded. Please ensure jquery.signalR-x.js is referenced before ~/signalr/js.");
}
@@ -53,7 +55,7 @@
if (hub.client.hasOwnProperty(memberKey)) {
memberValue = hub.client[memberKey];
- if (!$.isFunction(memberValue)) {
+ if (!isFunction(memberValue)) {
// Not a client hub function
continue;
}
diff --git a/packages/devextreme/testing/helpers/gridBaseMocks.js b/packages/devextreme/testing/helpers/gridBaseMocks.js
index e2b26c4eb314..bc72a0bcaeaf 100644
--- a/packages/devextreme/testing/helpers/gridBaseMocks.js
+++ b/packages/devextreme/testing/helpers/gridBaseMocks.js
@@ -1046,7 +1046,7 @@ module.exports = function($, gridCore, columnResizingReordering, domUtils, commo
if(options) {
if(options.initDefaultOptions) {
$.each(modules, function() {
- if($.isFunction(this.defaultOptions)) {
+ if(typeUtils.isFunction(this.defaultOptions)) {
that.option(this.defaultOptions());
}
});
diff --git a/packages/devextreme/testing/helpers/nativePointerMock.js b/packages/devextreme/testing/helpers/nativePointerMock.js
index 3ae8ec0c7c3b..fab9e3227981 100644
--- a/packages/devextreme/testing/helpers/nativePointerMock.js
+++ b/packages/devextreme/testing/helpers/nativePointerMock.js
@@ -41,6 +41,7 @@
const isBoolean = function(val) { return typeof val === 'boolean'; };
const isObject = function(val) { return typeof val === 'object'; };
const isNumeric = function(val) { return typeof val === 'number'; };
+ const isFunction = function(val) { return typeof val === 'function'; };
const MOUSE_EVENTS = {
'click': 1,
@@ -329,7 +330,7 @@
if(!isNumeric(detail)) {
detail = 1;
- if($.isFunction(document.createEvent)) {
+ if(isFunction(document.createEvent)) {
customEvent = document.createEvent('UIEvents');
customEvent.initUIEvent(type, bubbles, cancelable, view, detail);
diff --git a/packages/devextreme/testing/helpers/vizMocks.js b/packages/devextreme/testing/helpers/vizMocks.js
index 1ce9153eb7c8..3b281643553d 100644
--- a/packages/devextreme/testing/helpers/vizMocks.js
+++ b/packages/devextreme/testing/helpers/vizMocks.js
@@ -15,7 +15,8 @@
require('viz/core/renderers/renderer'),
require('viz/core/errors_warnings'),
require('__internal/viz/core/m_base_widget'),
- require('viz/core/base_widget.utils')
+ require('viz/core/base_widget.utils'),
+ require('core/utils/type')
);
});
} else {
@@ -32,10 +33,11 @@
DevExpress.require('viz/core/renderers/renderer'),
DevExpress.require('viz/core/errors_warnings'),
DevExpress.require('__internal/viz/core/m_base_widget'),
- DevExpress.require('viz/core/base_widget.utils')
+ DevExpress.require('viz/core/base_widget.utils'),
+ DevExpress.require('core/utils/type')
);
}
-}(window, function($, tooltipModule, titleModule, legendModule, axisModule, pointModule, Series, loadingIndicatorModule, exportMenuModule, rendererModule, errors, baseWidgetModule, baseWidgetUtils) {
+}(window, function($, tooltipModule, titleModule, legendModule, axisModule, pointModule, Series, loadingIndicatorModule, exportMenuModule, rendererModule, errors, baseWidgetModule, baseWidgetUtils, typeUtils) {
/* global currentAssert, currentTest */
const Element = stubClass(rendererModule.SvgElement, {
@@ -94,7 +96,7 @@
return this;
},
getBBox: function() {
- const template = $.isFunction(this.renderer.bBoxTemplate) ? this.renderer.bBoxTemplate.call(this) : this.renderer.bBoxTemplate;
+ const template = typeUtils.isFunction(this.renderer.bBoxTemplate) ? this.renderer.bBoxTemplate.call(this) : this.renderer.bBoxTemplate;
return $.extend({}, template);
},
dispose: function() {
@@ -219,9 +221,9 @@
this._resetStub = function(stub) {
$.each(stub, function(key, value) {
- if($.isFunction(value && value.reset)) {
+ if(typeUtils.isFunction(value && value.reset)) {
value.reset();
- $.isFunction(value.resetBehavior) && value.resetBehavior();
+ typeUtils.isFunction(value.resetBehavior) && value.resetBehavior();
} else {
stub[key] = undefined;
}
diff --git a/packages/devextreme/testing/helpers/widgetsIterator.js b/packages/devextreme/testing/helpers/widgetsIterator.js
index 56c622cd563f..b8f8a922fa88 100644
--- a/packages/devextreme/testing/helpers/widgetsIterator.js
+++ b/packages/devextreme/testing/helpers/widgetsIterator.js
@@ -1,5 +1,6 @@
define(function(require) {
const $ = require('jquery');
+ const typeUtils = require('core/utils/type');
return function(namespace, parent, excluded) {
excluded = excluded || [];
@@ -12,7 +13,7 @@ define(function(require) {
return;
}
- if($.isFunction(excluded) ? !excluded(componentName) : $.inArray(componentName, excluded) > -1) {
+ if(typeUtils.isFunction(excluded) ? !excluded(componentName) : $.inArray(componentName, excluded) > -1) {
return;
}
diff --git a/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js b/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js
index 070d6b6c34f9..030ef1dd3eef 100644
--- a/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js
@@ -1,5 +1,6 @@
define(function(require) {
const $ = require('jquery');
+ const typeUtils = require('core/utils/type');
const registerEvent = require('events/core/event_registrator');
const Class = require('core/class');
@@ -87,7 +88,7 @@ define(function(require) {
assert.strictEqual(LOG.arguments[0], this.element[0], 'element');
assert.strictEqual(LOG.arguments[1], data, 'data');
assert.deepEqual(LOG.arguments[2], ['test1', 'test2'], 'namespaces');
- assert.ok($.isFunction(LOG.arguments[3]), 'eventHandle');
+ assert.ok(typeUtils.isFunction(LOG.arguments[3]), 'eventHandle');
});
QUnit.test('\'teardown\' method', function(assert) {
@@ -105,7 +106,7 @@ define(function(require) {
assert.equal(LOG.arguments.length, 3, 'arguments count');
assert.strictEqual(LOG.arguments[0], this.element[0], 'element');
assert.deepEqual(LOG.arguments[1], ['test1', 'test2'], 'namespaces');
- assert.ok($.isFunction(LOG.arguments[2]), 'eventHandle');
+ assert.ok(typeUtils.isFunction(LOG.arguments[2]), 'eventHandle');
});
QUnit.test('\'add\' method', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js
index 457fb2d01906..938a16bdce97 100644
--- a/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
import ko from 'knockout';
import { DataSource } from 'data/data_source/data_source';
import { logger } from 'core/utils/console';
+import { isFunction } from 'core/utils/type';
import fx from 'animation/fx';
import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter';
import dataGridMocks from '../../helpers/dataGridMocks.js';
@@ -51,7 +52,7 @@ const processColumnsForCompare = function(columns, parameterNames) {
delete this[propertyName];
}
} else {
- if($.isFunction(this[propertyName])) {
+ if(isFunction(this[propertyName])) {
delete this[propertyName];
}
if(propertyName === 'filterOperations' ||
diff --git a/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js b/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js
index cf45f8dd2395..205c8916681b 100644
--- a/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js
+++ b/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js
@@ -5,6 +5,7 @@ import messageLocalization from 'localization/message';
import errors from 'core/errors';
import localization from 'localization';
import config from 'core/config';
+import { isFunction } from 'core/utils/type';
import { logger } from 'core/utils/console';
import { generateDate } from '../../../helpers/dateHelper.js';
@@ -14,7 +15,7 @@ export default function() {
const checkModules = function(testName, namespace, methods) {
QUnit.test(testName, function(assert) {
$.each(methods, function(index, method) {
- assert.ok($.isFunction(namespace[method]), method + ' method exists');
+ assert.ok(isFunction(namespace[method]), method + ' method exists');
});
});
};
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js
index 8991da54889f..6bb8ed6bbf5c 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js
@@ -3,6 +3,7 @@ import registerEvent from 'events/core/event_registrator';
import eventsEngine from 'events/core/events_engine';
import registerEventCallbacks from 'events/core/event_registrator_callbacks';
import Class from 'core/class';
+import { isFunction } from 'core/utils/type';
import eventHelper from '../../helpers/eventHelper.js';
@@ -87,7 +88,7 @@ QUnit.test('\'setup\' method', function(assert) {
assert.strictEqual(LOG.arguments[0], this.element[0], 'element');
assert.strictEqual(LOG.arguments[1], data, 'data');
assert.deepEqual(LOG.arguments[2], ['test1', 'test2'], 'namespaces');
- assert.ok($.isFunction(LOG.arguments[3]), 'eventHandle');
+ assert.ok(isFunction(LOG.arguments[3]), 'eventHandle');
});
QUnit.test('\'teardown\' method', function(assert) {
@@ -103,7 +104,7 @@ QUnit.test('\'teardown\' method', function(assert) {
assert.equal(LOG.arguments.length, 3, 'arguments count');
assert.strictEqual(LOG.arguments[0], this.element[0], 'element');
assert.deepEqual(LOG.arguments[1], ['test1', 'test2'], 'namespaces');
- assert.ok($.isFunction(LOG.arguments[2]), 'eventHandle');
+ assert.ok(isFunction(LOG.arguments[2]), 'eventHandle');
});
QUnit.test('\'add\' method', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js
index e17b0d147aca..59cc6031f727 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js
@@ -1,5 +1,6 @@
const $ = require('jquery');
const noop = require('core/utils/common').noop;
+const typeUtils = require('core/utils/type');
const BaseStrategy = require('events/pointer/base');
const registerEvent = require('events/core/event_registrator');
const special = require('../../../helpers/eventHelper.js').special;
@@ -231,7 +232,7 @@ QUnit.test('event is triggered one time after refresh', function(assert) {
});
QUnit.test('pointer event base strategy should have \'setup\' implementation, because jQuery adds a browser event via addEventListener/attachEvent otherwise (T208653)', function(assert) {
- assert.ok($.isFunction((new BaseStrategy('', '')).setup));
+ assert.ok(typeUtils.isFunction((new BaseStrategy('', '')).setup));
});
QUnit.test('pointer events should correctly unsubscribe events with target', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js
index 87bcb225c478..3d23530c201a 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js
@@ -62,7 +62,7 @@ const processColumnsForCompare = function(columns, parameterNames, ignoreParamet
delete this[propertyName];
}
} else {
- if($.isFunction(this[propertyName])) {
+ if(isFunction(this[propertyName])) {
delete this[propertyName];
}
if([
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js
index f1b99abd7857..6f66c2685af5 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js
@@ -6880,14 +6880,14 @@ QUnit.module('Filtering', {
assert.ok(Array.isArray(filter[0]), 'first argument is filter expression');
assert.strictEqual(filter[1], 'and', 'second argument is operation \'and\'');
assert.ok(Array.isArray(filter[2]), 'third argument is filter expression');
- assert.ok($.isFunction(filter[0][0]), 'filter expression selector is function');
+ assert.ok(typeUtils.isFunction(filter[0][0]), 'filter expression selector is function');
filter = this.getCombinedFilter(true);
assert.ok(Array.isArray(filter[0]), 'first argument is filter expression');
assert.strictEqual(filter[1], 'and', 'second argument is operation \'and\'');
assert.ok(Array.isArray(filter[2]), 'third argument is filter expression');
assert.equal(filter.length, 3, 'filter expression + \'and\' + \'filter expression\'');
- assert.ok(!$.isFunction(filter[2][0]), 'filter expression selector isn\'t function');
+ assert.ok(!typeUtils.isFunction(filter[2][0]), 'filter expression selector isn\'t function');
assert.strictEqual(filter[0][0], 'name', 'value of the selector');
});
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js
index f773886c7ecf..166113a48438 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js
@@ -3100,7 +3100,7 @@ QUnit.module('API methods', baseModuleConfig, () => {
let reloadResolved = false;
const d = dataGrid.refresh();
- assert.ok($.isFunction(d.promise), 'type object is the Deferred');
+ assert.ok(typeUtils.isFunction(d.promise), 'type object is the Deferred');
d.done(function() {
reloadResolved = true;
});
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js
index eda9ba9a35d0..b93f6f31fe9b 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js
@@ -6,6 +6,7 @@ import gridCoreUtils from '__internal/grids/grid_core/m_utils';
import $ from 'jquery';
import ArrayStore from 'data/array_store';
import { noop } from 'core/utils/common';
+import { isFunction } from 'core/utils/type';
import ODataStore from 'data/odata/store';
import devices from 'core/devices';
import { DataSource } from 'data/data_source/data_source';
@@ -1764,7 +1765,7 @@ QUnit.module('Header Filter', {
// assert
assert.ok(list.option('searchEnabled'), 'list with search bar');
- assert.ok($.isFunction(list.option('searchExpr')), 'expr is correct');
+ assert.ok(isFunction(list.option('searchExpr')), 'expr is correct');
assert.equal(list.option('searchTimeout'), 300, 'search timeout is assigned');
assert.equal(list.option('searchMode'), 'contains', 'search mode is default');
});
@@ -1803,7 +1804,7 @@ QUnit.module('Header Filter', {
// assert
assert.ok(list.option('searchEnabled'), 'list with search bar');
- assert.ok($.isFunction(list.option('searchExpr')), 'expr is correct');
+ assert.ok(isFunction(list.option('searchExpr')), 'expr is correct');
assert.equal(list.option('searchTimeout'), 300, 'search timeout is assigned');
assert.equal(list.option('searchMode'), 'equals', 'search mode is assigned');
});
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js
index 973438fec92a..a7c2e103cd47 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js
@@ -5,7 +5,7 @@ import dataUtils from 'core/element_data';
import config from 'core/config';
import browser from 'core/utils/browser';
import errors from 'core/errors';
-import { isRenderer } from 'core/utils/type';
+import { isFunction, isRenderer } from 'core/utils/type';
import { normalizeKeyName } from 'events/utils/index';
import ArrayStore from 'data/array_store';
@@ -1566,7 +1566,7 @@ QUnit.module('options', {
const popup = $lookup.find('.' + POPUP_CLASS).dxPopup('instance');
let initialValue = popup.option('width');
- if($.isFunction(initialValue)) {
+ if(isFunction(initialValue)) {
initialValue = initialValue();
}
@@ -1574,7 +1574,7 @@ QUnit.module('options', {
instance.option('dropDownOptions.width', 'auto');
let autoValue = popup.option('width');
- if($.isFunction(autoValue)) {
+ if(isFunction(autoValue)) {
autoValue = autoValue();
}
@@ -1600,7 +1600,7 @@ QUnit.module('options', {
const popup = $lookup.find('.' + POPUP_CLASS).dxPopup('instance');
let initialValue = popup.option('height');
- if($.isFunction(initialValue)) {
+ if(isFunction(initialValue)) {
initialValue = initialValue();
}
@@ -1608,7 +1608,7 @@ QUnit.module('options', {
instance.option('dropDownOptions.height', 'auto');
let autoValue = popup.option('height');
- if($.isFunction(autoValue)) {
+ if(isFunction(autoValue)) {
autoValue = autoValue();
}
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 a3f3b2e83cab..1cdfc44bd0bf 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,6 +1,6 @@
import $ from 'jquery';
import { DataSource } from 'data/data_source/data_source';
-import { isRenderer } from 'core/utils/type';
+import { isFunction, isRenderer } from 'core/utils/type';
import { createTextElementHiddenCopy } from 'core/utils/dom';
import ajaxMock from '../../helpers/ajaxMock.js';
import config from 'core/config';
@@ -6819,7 +6819,7 @@ QUnit.module('performance', () => {
$item.trigger('dxclick');
const filter = load.lastCall.args[0].filter;
- assert.ok($.isFunction(filter), 'filter is function');
+ assert.ok(isFunction(filter), 'filter is function');
});
QUnit.test('loadOptions.filter should be correct when user filter is also used', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/chartIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/chartIntegration.tests.js
index 6dbd05959981..542370705e90 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/chartIntegration.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/chartIntegration.tests.js
@@ -2,6 +2,7 @@
import '../../helpers/noIntl.js';
import $ from 'jquery';
+import { isFunction } from 'core/utils/type';
import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source';
import executeAsyncMock from '../../helpers/executeAsyncMock.js';
@@ -79,7 +80,7 @@ QUnit.module('Chart Binding', {
const pivotGrid = createPivotGrid();
assert.ok(pivotGrid);
- assert.ok($.isFunction(pivotGrid.bindChart));
+ assert.ok(isFunction(pivotGrid.bindChart));
});
QUnit.test('Call bind chart without arguments', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js
index 3bf12679570b..dadb981d0a8a 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js
@@ -2,6 +2,7 @@ import fx from 'animation/fx';
import { DataSource } from 'data/data_source/data_source';
import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change';
+import { isFunction } from 'core/utils/type';
import $ from 'jquery';
import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider';
import errors from 'ui/widget/ui.errors';
@@ -92,8 +93,8 @@ QUnit.module('Initialization', {
'allDay',
'recurrenceRule',
'recurrenceException'], function(_, field) {
- assert.ok($.isFunction(dataAccessors.getter[field]), '\'' + field + '\' getter is OK');
- assert.ok($.isFunction(dataAccessors.setter[field]), '\'' + field + '\' setter is OK');
+ assert.ok(isFunction(dataAccessors.getter[field]), '\'' + field + '\' getter is OK');
+ assert.ok(isFunction(dataAccessors.setter[field]), '\'' + field + '\' setter is OK');
});
});
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js
index dc1e8a680f79..365741c26263 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js
@@ -9,7 +9,7 @@ import ContextMenu from 'ui/context_menu';
import { addNamespace } from 'events/utils/index';
import contextMenuEvent from 'events/contextmenu';
import holdEvent from 'events/hold';
-import { isRenderer } from 'core/utils/type';
+import { isFunction, isRenderer } from 'core/utils/type';
import config from 'core/config';
import keyboardMock from '../../helpers/keyboardMock.js';
import ariaAccessibilityTestHelper from '../../helpers/ariaAccessibilityTestHelper.js';
@@ -1013,11 +1013,11 @@ QUnit.module('Showing and hiding context menu', moduleConfig, () => {
let d = instance.show();
- assert.ok($.isFunction(d.promise), 'type object is the Deferred');
+ assert.ok(isFunction(d.promise), 'type object is the Deferred');
d = instance.hide();
- assert.ok($.isFunction(d.promise), 'type object is the Deferred');
+ assert.ok(isFunction(d.promise), 'type object is the Deferred');
});
QUnit.test('overlay wrapper should have the same size as window (T1102095)', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js
index c6dfe9464bde..9d875ed4401e 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import { DataSource } from 'data/data_source/data_source';
-import { isRenderer } from 'core/utils/type';
+import { isFunction, isRenderer } from 'core/utils/type';
import { noop } from 'core/utils/common';
import config from 'core/config';
import devices from 'core/devices';
@@ -94,7 +94,7 @@ const ScrollViewMock = DOMComponent.inherit({
pullDown() {
const pullDownHandler = this.option('onPullDown');
- if($.isFunction(pullDownHandler)) {
+ if(isFunction(pullDownHandler)) {
pullDownHandler();
}
},
@@ -102,7 +102,7 @@ const ScrollViewMock = DOMComponent.inherit({
scrollBottom() {
const scrollBottomHandler = this.option('onReachBottom');
- if($.isFunction(scrollBottomHandler)) {
+ if(isFunction(scrollBottomHandler)) {
scrollBottomHandler();
}
},
@@ -2230,7 +2230,7 @@ QUnit.module('dataSource integration', moduleSetup, () => {
const widget = this.element.dxList('instance');
const changedHandler = widget._proxiedDataSourceChangedHandler;
- assert.ok($.isFunction(changedHandler));
+ assert.ok(isFunction(changedHandler));
assert.ok(dataSource._eventsStrategy._events['changed'].has(changedHandler));
widget._dispose();
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js
index a5a470ad0342..fd1733a9b437 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js
@@ -3,6 +3,7 @@
import $ from 'jquery';
import CustomStore from 'data/custom_store';
import ArrayStore from 'data/array_store';
+import { isFunction } from 'core/utils/type';
import 'ui/tree_view';
@@ -158,7 +159,7 @@ window.initTree = function(options) {
window.stripFunctions = function(obj) {
const result = $.extend(true, {}, obj);
$.each(result, function(field, value) {
- if($.isFunction(value)) {
+ if(isFunction(value)) {
delete result[field];
}
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
index aec51432c45d..7ccfff40ca4a 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
@@ -7,6 +7,7 @@ import devices from 'core/devices';
import themes from 'ui/themes';
import support from 'core/utils/support';
import publicComponentUtils from 'core/utils/public_component';
+import { isFunction } from 'core/utils/type';
import { getNestedOptionValue } from 'core/options/utils';
import ActionSheet from 'ui/action_sheet';
@@ -94,7 +95,7 @@ const testComponentDefaults = function(componentClass, forcedDevices, options, b
}
const $container = $('#cmp');
const component = new componentClass($container);
- options = $.isFunction(options) ? options.call(component) : options;
+ options = isFunction(options) ? options.call(component) : options;
const defaults = component.option();
checkOptions.apply(component, [options, defaults, JSON.stringify(device), assert]);
@@ -111,7 +112,7 @@ const checkOptions = function(expectedOptions, resultOptions, deviceString, asse
$.each(expectedOptions, function(optionName, expectedValue) {
let resultValue = getNestedOptionValue(resultOptions, optionName);
- resultValue = $.isFunction(resultValue) ? resultValue.call(that) : resultValue;
+ resultValue = isFunction(resultValue) ? resultValue.call(that) : resultValue;
if($.isPlainObject(expectedValue)) {
checkOptions(expectedValue, resultValue, null, assert);
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js
index 600295652553..112c832f05fc 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js
@@ -12,6 +12,7 @@ import pointerMock from '../../helpers/pointerMock.js';
import config from 'core/config';
import dataUtils from 'core/element_data';
import { deferUpdate } from 'core/utils/common';
+import { isFunction } from 'core/utils/type';
import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js';
import 'generic_light.css!';
@@ -441,7 +442,7 @@ QUnit.module('API', {
const element = $('#widget');
const instance = new NewWidget(element);
- assert.ok($.isFunction(instance.repaint));
+ assert.ok(isFunction(instance.repaint));
const children = element.children();
@@ -455,7 +456,7 @@ QUnit.module('API', {
const $anotherElement = $('#another').dxWidget({ focusStateEnabled: true });
const anotherInstance = $anotherElement.dxWidget('instance');
- assert.ok($.isFunction(instance.focus), 'focus method exist');
+ assert.ok(isFunction(instance.focus), 'focus method exist');
anotherInstance.focus();
assert.ok($anotherElement.hasClass(FOCUSED_STATE_CLASS), '\'focus\' method focus the widget');
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js
index 53a73ac4c48d..9bb848c33668 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js
@@ -1,5 +1,6 @@
const $ = require('jquery');
const noop = require('core/utils/common').noop;
+const typeUtils = require('core/utils/type');
const vizMocks = require('../../helpers/vizMocks.js');
const commons = require('./chartParts/commons.js');
const DataSource = require('data/data_source/data_source').DataSource;
@@ -21,8 +22,8 @@ QUnit.module('dxChart', commons.environment);
QUnit.test('dxChart creation', function(assert) {
const chart = this.createChart({});
- assert.ok($.isFunction(chart.showLoadingIndicator));
- assert.ok($.isFunction(chart.hideLoadingIndicator));
+ assert.ok(typeUtils.isFunction(chart.showLoadingIndicator));
+ assert.ok(typeUtils.isFunction(chart.hideLoadingIndicator));
assert.strictEqual(rendererModule.Renderer.firstCall.args[0]['cssClass'], 'dxc dxc-chart', 'root class');
});
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part3.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part3.tests.js
index 7cd68867ec11..40d77ef58eff 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part3.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part3.tests.js
@@ -1,4 +1,5 @@
const $ = require('jquery');
+const typeUtils = require('core/utils/type');
const commons = require('./chartParts/commons.js');
const rendererModule = require('viz/core/renderers/renderer');
const legendModule = require('viz/components/legend');
@@ -1078,7 +1079,7 @@ QUnit.test('Create Horizontal Legend with single named series, position = outsid
assert.strictEqual(legendCtorArgs.backgroundClass, 'dxc-border', 'background class');
assert.strictEqual(legendCtorArgs.itemGroupClass, 'dxc-item', 'item group class');
assert.strictEqual(legendCtorArgs.textField, 'seriesName', 'text field');
- assert.ok($.isFunction(legendCtorArgs.getFormatObject), 'getFormatObject is function');
+ assert.ok(typeUtils.isFunction(legendCtorArgs.getFormatObject), 'getFormatObject is function');
assert.deepEqual(legendCtorArgs.getFormatObject({
id: 'id',
text: 'text',
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js
index a91849289391..992d86cfd4c2 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js
@@ -1,5 +1,6 @@
import $ from 'jquery';
import { noop } from 'core/utils/common';
+import { isFunction } from 'core/utils/type';
import vizMocks from '../../helpers/vizMocks.js';
import executeAsyncMock from '../../helpers/executeAsyncMock.js';
import commons from './chartParts/commons.js';
@@ -1503,7 +1504,7 @@ const overlappingEnvironment = $.extend({}, environment, {
});
// assert
- assert.ok($.isFunction(this.stubSeries.legendCallback), 'legend callback passed');
+ assert.ok(isFunction(this.stubSeries.legendCallback), 'legend callback passed');
});
QUnit.test('Legend callback', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/translator2D.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/translator2D.tests.js
index 1b60882b87e1..0734886978fd 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.core/translator2D.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.core/translator2D.tests.js
@@ -1,6 +1,7 @@
import $ from 'jquery';
import translator2DModule from 'viz/translators/translator2d';
import { adjust } from 'core/utils/math';
+import { isFunction } from '../../../js/core/utils/type';
function prepareScaleBreaks(array, breakSize) {
const breaks = [];
@@ -110,9 +111,9 @@ QUnit.test('Create vertical translator', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: 0, minVisible: 10, max: 100, maxVisible: 90, interval: 20, axisType: 'continuous', dataType: 'numeric', invert: true });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.equal(translator._canvasOptions.rangeMin, 0);
assert.equal(translator._canvasOptions.rangeMax, 100);
@@ -149,9 +150,9 @@ QUnit.test('Create horizontal translator', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: 0, minVisible: 10, max: 100, maxVisible: 90, interval: 20, axisType: 'continuous', dataType: 'numeric', invert: true });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.equal(translator._canvasOptions.rangeMin, 0);
assert.equal(translator._canvasOptions.rangeMax, 100);
@@ -188,9 +189,9 @@ QUnit.test('Create numeric translator', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: 0, minVisible: 0, max: 100, maxVisible: 100, interval: 20, axisType: 'continuous', dataType: 'numeric' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
});
QUnit.test('Create numeric translator when business range delta = 0, Min = max = minVisible = maxVisible != 0', function(assert) {
@@ -326,9 +327,9 @@ QUnit.test('Create datetime translator', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: new Date(2012, 9, 1), max: new Date(2012, 9, 2), minVisible: new Date(2012, 9, 1), maxVisible: new Date(2012, 9, 2), interval: new Date(2012, 9, 2) - new Date(2012, 9, 1), axisType: 'continuous', dataType: 'datetime' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
});
QUnit.test('Create datetime translator when business range delta = 0. min = minVisible = maxVisible = max', function(assert) {
@@ -420,9 +421,9 @@ QUnit.test('Create discrete translator (Stick = false, invert = false)', functio
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { categories: ['First', 'Second', 'Third', 'Fourth'], axisType: 'discrete', dataType: 'string' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.deepEqual(translator._categories, ['First', 'Second', 'Third', 'Fourth']);
assert.equal(translator._canvasOptions.interval, 127.5);
@@ -470,9 +471,9 @@ QUnit.test('Create logarithmic translator', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: 10, minVisible: 100, max: 10000, maxVisible: 1000, interval: 1, base: 10, axisType: 'logarithmic', dataType: 'numeric' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.roughEqual(translator._canvasOptions.rangeMaxVisible, 3, 0.00001);
assert.roughEqual(translator._canvasOptions.rangeMinVisible, 2, 0.00001);
@@ -493,9 +494,9 @@ QUnit.test('Create logarithmic translator. Min = max = minVisible = maxVisible =
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: 10, minVisible: 10, max: 10, maxVisible: 10, interval: 1, base: 10, axisType: 'logarithmic', dataType: 'numeric' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.equal(translator._canvasOptions.rangeMaxVisible, 1);
assert.equal(translator._canvasOptions.rangeMinVisible, 1);
@@ -516,9 +517,9 @@ QUnit.test('Create logarithmic translator. Base = 2', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: 2, minVisible: 4, max: 32, maxVisible: 16, interval: 1, base: 2, axisType: 'logarithmic', dataType: 'numeric' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.roughEqual(translator._canvasOptions.rangeMaxVisible, 4, 0.00001);
assert.roughEqual(translator._canvasOptions.rangeMinVisible, 2, 0.00001);
@@ -564,9 +565,9 @@ QUnit.test('Update business range', function(assert) {
assert.deepEqual(translator._canvas, { width: 610, height: 400, left: 70, top: 10, right: 30, bottom: 60 });
assert.deepEqual(getObjectData(translator._businessRange), { min: -1000, minVisible: -600, maxVisible: -90, max: -10, invert: false, axisType: 'continuous', dataType: 'numeric' });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.equal(translator._canvasOptions.rangeMin, -1000);
assert.equal(translator._canvasOptions.rangeMax, -10);
@@ -592,9 +593,9 @@ QUnit.test('Update canvas', function(assert) {
assert.deepEqual(translator._canvas, { width: 333, height: 444, left: 13, top: 15, right: 14, bottom: 16 });
- assert.ok($.isFunction(translator.translate));
- assert.ok($.isFunction(translator.from));
- assert.ok($.isFunction(translator.getInterval));
+ assert.ok(isFunction(translator.translate));
+ assert.ok(isFunction(translator.from));
+ assert.ok(isFunction(translator.getInterval));
assert.equal(translator._canvasOptions.rangeMin, 0);
assert.equal(translator._canvasOptions.rangeMax, 100);
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js
index 1313bbbbde8e..509b6d83a279 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js
@@ -833,11 +833,11 @@ QUnit.module('SvgAnimationStep', {
QUnit.test('animateSvgStep object', function(assert) {
const step = this.animationStep;
assert.ok(step);
- assert.ok($.isFunction(step.segments), 'can animate segments');
- assert.ok($.isFunction(step.transform), 'can animate transform');
- assert.ok($.isFunction(step.complete), 'complete action for all animate');
- assert.ok($.isFunction(step.base), 'can translate same attribute');
- assert.ok($.isFunction(step._), 'no action step');
+ assert.ok(typeUtils.isFunction(step.segments), 'can animate segments');
+ assert.ok(typeUtils.isFunction(step.transform), 'can animate transform');
+ assert.ok(typeUtils.isFunction(step.complete), 'complete action for all animate');
+ assert.ok(typeUtils.isFunction(step.base), 'can translate same attribute');
+ assert.ok(typeUtils.isFunction(step._), 'no action step');
});
QUnit.test('Base step', function(assert) {
diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js
index 691cd7511c7e..a0040f05fcea 100644
--- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js
@@ -1,6 +1,7 @@
/* global currentTest, createTestContainer */
const $ = require('jquery');
+const typeUtils = require('core/utils/type');
const vizMocks = require('../../helpers/vizMocks.js');
const tooltipModule = require('viz/core/tooltip');
const BaseWidget = require('__internal/viz/core/m_base_widget').default;
@@ -2076,7 +2077,7 @@ QUnit.begin(function() {
QUnit.test('sparkline contains export methods', function(assert) {
const sparkline = this.createSparkline({});
- assert.ok($.isFunction(sparkline.exportTo));
+ assert.ok(typeUtils.isFunction(sparkline.exportTo));
});
QUnit.module('drawn', {
From b9a9db80fe6c489f2c454610aeb19753eb5d0659 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:10:49 +0200
Subject: [PATCH 18/20] $.type -> core/utils/type: isNumeric + isDate
---
.../tests/DevExpress.data/odataCommonOData.tests.js | 9 +++++----
.../testing/tests/DevExpress.data/odataStore.tests.js | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js
index 29fec4dfbad4..7df9147c0b8c 100644
--- a/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js
@@ -2,6 +2,7 @@ const $ = require('jquery');
const converters = require('data/odata/utils').keyConverters;
const interpretJsonFormat = require('data/odata/utils').OData__internals.interpretJsonFormat;
const Guid = require('core/guid');
+const typeUtils = require('core/utils/type');
QUnit.module('OData 2');
QUnit.test('key converters', function(assert) {
@@ -82,10 +83,10 @@ QUnit.test('count', function(assert) {
const t4 = interpretJsonFormat(a4, 'success');
assert.equal(t1.count, 3);
- assert.equal($.type(t1.count), 'number');
+ assert.ok(typeUtils.isNumeric(t1.count));
assert.equal(t2.count, 3);
- assert.equal($.type(t2.count), 'number');
+ assert.ok(typeUtils.isNumeric(t2.count));
assert.ok(!t3.count);
assert.ok(!t4.count);
@@ -172,10 +173,10 @@ QUnit.test('count', function(assert) {
const t4 = interpretJsonFormat(a4, 'success');
assert.equal(t1.count, 3);
- assert.equal($.type(t1.count), 'number');
+ assert.ok(typeUtils.isNumeric(t1.count));
assert.equal(t2.count, 3);
- assert.equal($.type(t2.count), 'number');
+ assert.ok(typeUtils.isNumeric(t2.count));
assert.ok(!t3.count);
assert.ok(!t4.count);
diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js
index 47aeef00fdec..98741a968bcb 100644
--- a/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js
@@ -3,6 +3,7 @@ import { EdmLiteral } from 'data/odata/utils';
import ODataStore from 'data/odata/store';
import ODataContext from 'data/odata/context';
import Guid from 'core/guid';
+import { isDate } from 'core/utils/type';
import config from 'core/config';
import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js';
import ajaxMock from '../../helpers/ajaxMock.js';
@@ -1798,7 +1799,7 @@ QUnit.test('Dates, disableable, ODataContext', function(assert) {
ctx.Y.load()
.done(function(r) {
- assert.strictEqual($.type(r[0].dateProperty), 'date');
+ assert.ok(isDate(r[0].dateProperty));
})
];
From 86875f490cb0f972420d4201e460a3fed6d72345 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:19:59 +0200
Subject: [PATCH 19/20] $.trim - likely redundant, ref
610f3af10d3a865f08f315edf8b4495770d11f36
---
.../hierarchicalCollectionWidget.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js
index e01abd95a4bb..950f1c96def3 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js
@@ -44,7 +44,7 @@ module('render', {
assert.equal(this.element.children().length, 2);
assert.equal(this.element.children().eq(0).text().trim(), 'item 1');
- assert.ok(this.element.children().eq(0).hasClass(DISABLED_STATE_CLASS).trim());
+ assert.ok(this.element.children().eq(0).hasClass(DISABLED_STATE_CLASS));
assert.equal(this.element.children().eq(1).text().trim(), 'item 2');
});
From 4e7353582677afdc1c46e1beca84ba868fe53d5c Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:41:39 +0200
Subject: [PATCH 20/20] splice -> slice + re-assign, ref
2bc781cb5c4a9cd1725f54a464cae2001b458e96
---
.../grids/grid_core/column_fixing/m_column_fixing.ts | 4 ++--
.../js/__internal/ui/toolbar/strategy/m_toolbar.singleline.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts
index ab80edcd5c5f..edd8430a2848 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts
@@ -637,11 +637,11 @@ const columnHeadersView = (Base: ModuleType
) => class ColumnH
return this._fixedTableElement && this._getRowElements(this._fixedTableElement).eq(rowIndex).children();
}
- const columnElements: any = that.getColumnElements();
+ let columnElements: any = that.getColumnElements();
const $transparentColumnElement = that.getTransparentColumnElement();
if (columnElements && $transparentColumnElement && $transparentColumnElement.length) {
const transparentColumnIndex = getTransparentColumnIndex(that.getFixedColumns());
- columnElements.splice(transparentColumnIndex, $transparentColumnElement.get(0).colSpan, $transparentColumnElement.get(0));
+ columnElements = columnElements.slice(0, transparentColumnIndex).add(columnElements.slice(transparentColumnIndex + $transparentColumnElement.get(0).colSpan)); //$.splice
}
return columnElements;
diff --git a/packages/devextreme/js/__internal/ui/toolbar/strategy/m_toolbar.singleline.ts b/packages/devextreme/js/__internal/ui/toolbar/strategy/m_toolbar.singleline.ts
index 2bd6e2d665a0..e7d85fdea79e 100644
--- a/packages/devextreme/js/__internal/ui/toolbar/strategy/m_toolbar.singleline.ts
+++ b/packages/devextreme/js/__internal/ui/toolbar/strategy/m_toolbar.singleline.ts
@@ -216,7 +216,7 @@ export class SingleLineStrategy {
const $item = overflowItems.eq(-1);
$item.addClass(TOOLBAR_HIDDEN_ITEM);
itemsWidth = this._getItemsWidth();
- overflowItems = overflowItems.slice(0, -1);
+ overflowItems = overflowItems.slice(0, -1); //$.splice
}
}