diff --git a/src/valueParsers/ValueParserStore.js b/src/valueParsers/ValueParserStore.js index 3bbcbeb..56f65f8 100644 --- a/src/valueParsers/ValueParserStore.js +++ b/src/valueParsers/ValueParserStore.js @@ -9,7 +9,7 @@ * @throws {Error} if the provided argument is not a valueParsers.ValueParser constructor. */ function assertIsValueParserConstructor( Parser ) { - if( !( $.isFunction( Parser ) && Parser.prototype instanceof vp.ValueParser ) ) { + if( !( typeof Parser === 'function' && Parser.prototype instanceof vp.ValueParser ) ) { throw new Error( 'Invalid ValueParser constructor' ); } } diff --git a/tests/src/dataValues.DataValue.tests.js b/tests/src/dataValues.DataValue.tests.js index 6d6f0bd..508bc8f 100644 --- a/tests/src/dataValues.DataValue.tests.js +++ b/tests/src/dataValues.DataValue.tests.js @@ -84,7 +84,7 @@ var self = this; $.each( this, function( property, value ) { - if ( property.substring( 0, 4 ) === 'test' && $.isFunction( self[property] ) ) { + if ( property.substring( 0, 4 ) === 'test' && typeof self[property] === 'function' ) { QUnit.test( property, function( assert ) { @@ -137,7 +137,7 @@ var fnNewFromJSON = this.getConstructor().newFromJSON; assert.ok( - $.isFunction( fnNewFromJSON ), + typeof fnNewFromJSON === 'function', 'has a related newFromJSON function' ); }, diff --git a/tests/src/dataValues.tests.js b/tests/src/dataValues.tests.js index d881f5b..8b13eb7 100644 --- a/tests/src/dataValues.tests.js +++ b/tests/src/dataValues.tests.js @@ -11,7 +11,7 @@ var dvs = dv.getDataValues(); assert.expect( dvs.length * 2 + 1 ); - assert.ok( $.isArray( dvs ), 'Returns an array' ); + assert.ok( Array.isArray( dvs ), 'Returns an array' ); for ( var i = 0, s = dvs.length; i < s; i++ ) { assert.ok( diff --git a/tests/src/valueFormatters/valueFormatters.tests.js b/tests/src/valueFormatters/valueFormatters.tests.js index 556afc8..0f9ee43 100644 --- a/tests/src/valueFormatters/valueFormatters.tests.js +++ b/tests/src/valueFormatters/valueFormatters.tests.js @@ -69,7 +69,7 @@ var self = this; $.each( this, function( property, value ) { - if( property.substring( 0, 4 ) === 'test' && $.isFunction( self[property] ) ) { + if( property.substring( 0, 4 ) === 'test' && typeof self[property] === 'function' ) { QUnit.test( property, function( assert ) { @@ -100,7 +100,7 @@ : '', done = assert.async(); - if( $.isArray( expected ) ) { + if( Array.isArray( expected ) ) { expectedValue = expected[0]; expectedDataValue = expected[1]; } else { diff --git a/tests/src/valueParsers/valueParsers.tests.js b/tests/src/valueParsers/valueParsers.tests.js index 3a06772..289f06d 100644 --- a/tests/src/valueParsers/valueParsers.tests.js +++ b/tests/src/valueParsers/valueParsers.tests.js @@ -75,7 +75,7 @@ var self = this; $.each( this, function( property, value ) { - if ( property.substring( 0, 4 ) === 'test' && $.isFunction( self[property] ) ) { + if ( property.substring( 0, 4 ) === 'test' && typeof self[property] === 'function' ) { QUnit.test( property, function( assert ) {