aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2015-10-18 15:50:43 -0400
committerTimmy Willison <timmywillisn@gmail.com>2015-10-21 16:22:22 -0400
commit15ac848868e993dfe5ccd7751a94f5c8edc288bc (patch)
tree960ba49711a0b0fb43509973ca1db37f672b701c
parent1144e754a6a131bd4affec26fd85299e71bdab06 (diff)
downloadjquery-15ac848868e993dfe5ccd7751a94f5c8edc288bc.tar.gz
jquery-15ac848868e993dfe5ccd7751a94f5c8edc288bc.zip
Core: make isNumeric limited to strings and numbers
Fixes gh-2662
-rw-r--r--src/core.js12
-rw-r--r--test/unit/core.js2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core.js b/src/core.js
index a31e5f93f..8e43547ac 100644
--- a/src/core.js
+++ b/src/core.js
@@ -210,12 +210,12 @@ jQuery.extend( {
isNumeric: function( obj ) {
- // parseFloat NaNs numeric-cast false positives (null|true|false|"")
- // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
- // subtraction forces infinities to NaN
- // adding 1 corrects loss of precision from parseFloat (#15100)
- var realStringObj = obj && obj.toString();
- return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
+ // As of jQuery 3.0, isNumeric is limited to
+ // strings and numbers (primitives or objects)
+ // that can be coerced to finite numbers (gh-2662)
+ var type = jQuery.type( obj );
+ return ( type === "number" || type === "string" ) &&
+ ( obj - parseFloat( obj ) + 1 ) >= 0;
},
isPlainObject: function( obj ) {
diff --git a/test/unit/core.js b/test/unit/core.js
index 36504855d..dc644b504 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -474,8 +474,8 @@ QUnit.test( "isNumeric", function( assert ) {
assert.ok( t( 1.5999999999999999 ), "Very precise floating point number" );
assert.ok( t( 8e5 ), "Exponential notation" );
assert.ok( t( "123e-2" ), "Exponential notation string" );
- assert.ok( t( new ToString( "42" ) ), "Custom .toString returning number" );
+ assert.equal( t( new ToString( "42" ) ), false, "Custom .toString returning number" );
assert.equal( t( "" ), false, "Empty string" );
assert.equal( t( " " ), false, "Whitespace characters string" );
assert.equal( t( "\t\t" ), false, "Tab characters string" );