diff --git a/js/parts/Utilities.js b/js/parts/Utilities.js index 2c3558594d8..247584a0d22 100644 --- a/js/parts/Utilities.js +++ b/js/parts/Utilities.js @@ -449,7 +449,7 @@ H.merge = function () { if ( H.isObject(value, true) && !H.isClass(value) && - !H.isHTMLElement(value) + !H.isDOMElement(value) ) { copy[key] = doCopy(copy[key] || {}, value); @@ -530,12 +530,12 @@ H.isObject = function (obj, strict) { /** * Utility function to check if an Object is a HTML Element. * - * @function #isHTMLElement + * @function #isDOMElement * @memberOf Highcharts * @param {Object} obj - The item to check. * @returns {Boolean} - True if the argument is a HTML Element. */ -H.isHTMLElement = function (obj) { +H.isDOMElement = function (obj) { return H.isObject(obj) && typeof obj.nodeType === 'number'; }; @@ -551,7 +551,7 @@ H.isClass = function (obj) { var c = obj && obj.constructor; return !!( H.isObject(obj, true) && - !H.isHTMLElement(obj) && + !H.isDOMElement(obj) && (c && c.name && c.name !== 'Object') ); }; diff --git a/samples/unit-tests/utilities/utilities/demo.js b/samples/unit-tests/utilities/utilities/demo.js index 5852ea25aef..0f927d9c6f7 100644 --- a/samples/unit-tests/utilities/utilities/demo.js +++ b/samples/unit-tests/utilities/utilities/demo.js @@ -364,60 +364,60 @@ QUnit.test('DateFormat', function (assert) { }); -QUnit.test('isHTMLElement', function (assert) { - var isHTMLElement = Highcharts.isHTMLElement, +QUnit.test('isDOMElement', function (assert) { + var isDOMElement = Highcharts.isDOMElement, // Mock an ES6 class classes = { constructor: function TestClass() {} }; assert.strictEqual( - isHTMLElement("a"), + isDOMElement("a"), false, 'String is not a HTML Element' ); assert.strictEqual( - isHTMLElement(1), + isDOMElement(1), false, 'Number is not a HTML Element' ); assert.strictEqual( - isHTMLElement(true), + isDOMElement(true), false, 'Boolean is not a HTML Element' ); assert.strictEqual( - isHTMLElement(null), + isDOMElement(null), false, 'null is not a HTML Element' ); assert.strictEqual( - isHTMLElement(undefined), + isDOMElement(undefined), false, 'undefined is not a HTML Element' ); assert.strictEqual( - isHTMLElement([1]), + isDOMElement([1]), false, 'Array is not a HTML Element' ); assert.strictEqual( - isHTMLElement({ a: 1 }), + isDOMElement({ a: 1 }), false, 'Object is not a HTML Element' ); assert.strictEqual( - isHTMLElement(classes), + isDOMElement(classes), false, 'Object classes is not a HTML Element' ); assert.strictEqual( - isHTMLElement(document.createElement('div')), + isDOMElement(document.createElement('div')), true, 'HTMLElement is a HTML Element' ); assert.strictEqual( - isHTMLElement(function Test() {}), + isDOMElement(function Test() {}), false, 'Function is not a HTML Element' );