diff options
| -rw-r--r-- | src/.jshintrc | 3 | ||||
| -rw-r--r-- | test/.jshintrc | 3 | ||||
| -rw-r--r-- | test/unit/core.js | 2 | ||||
| -rw-r--r-- | test/unit/css.js | 2 | ||||
| -rw-r--r-- | test/unit/deferred.js | 8 | ||||
| -rw-r--r-- | test/unit/effects.js | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/src/.jshintrc b/src/.jshintrc index 6144bf420..281b683b9 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -12,8 +12,11 @@ "sub": true, + "es3": true, + "globals": { "window": true, + "JSON": false, "jQuery": true, "define": true, diff --git a/test/.jshintrc b/test/.jshintrc index 7aef665c6..6b380d6ba 100644 --- a/test/.jshintrc +++ b/test/.jshintrc @@ -10,6 +10,8 @@ "undef": true, "unused": true, + "es3": true, + "evil": true, "sub": true, @@ -21,6 +23,7 @@ "require": false, "define": false, "DOMParser": false, + "JSON": false, "Promise": false, "Symbol": false, "QUnit": false, diff --git a/test/unit/core.js b/test/unit/core.js index 5a87e2f0c..8cfe98f83 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -1400,7 +1400,7 @@ test("jQuery.parseJSON", function() { deepEqual( jQuery.parseJSON( "{ \"string\": \"\", \"number\": 4.2e+1, \"object\": {}," + "\"array\": [[]], \"boolean\": [ true, false ], \"null\": null }"), - { string: "", number: 42, object: {}, array: [[]], boolean: [ true, false ], "null": null }, + { string: "", number: 42, object: {}, array: [[]], "boolean": [ true, false ], "null": null }, "Dictionary of all data types" ); diff --git a/test/unit/css.js b/test/unit/css.js index 06de4acd9..47db2c8f3 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1225,7 +1225,7 @@ test( "Do not throw on frame elements from css method (#15098)", 1, function() { if ( transformName ) { equal( elemStyle[ transformName ], transformVal, "setting properly-prefixed transform" ); } - equal( elemStyle.undefined, undefined, "Nothing writes to node.style.undefined" ); + equal( elemStyle[ "undefined" ], undefined, "Nothing writes to node.style.undefined" ); } ); test( "Don't detect fake set properties on a node when caching the prefixed version", function() { diff --git a/test/unit/deferred.js b/test/unit/deferred.js index af91b3616..1aa15435f 100644 --- a/test/unit/deferred.js +++ b/test/unit/deferred.js @@ -172,7 +172,7 @@ test( "jQuery.Deferred.catch", function( assert ) { var value1, value2, value3, defer = jQuery.Deferred(), - piped = defer.catch(function( a, b ) { + piped = defer[ "catch" ](function( a, b ) { return a * b; }), done = jQuery.map( new Array( 3 ), function() { return assert.async(); } ); @@ -186,18 +186,18 @@ test( "jQuery.Deferred.catch", function( assert ) { value2 = b; }); - defer.reject( 2, 3 ).catch(function() { + defer.reject( 2, 3 )[ "catch" ](function() { assert.strictEqual( value1, 2, "first reject value ok" ); assert.strictEqual( value2, 3, "second reject value ok" ); assert.strictEqual( value3, 6, "result of filter ok" ); done.pop().call(); }); - jQuery.Deferred().resolve().catch(function() { + jQuery.Deferred().resolve()[ "catch" ](function() { assert.ok( false, "then should not be called on resolve" ); }).then( done.pop() ); - jQuery.Deferred().reject().catch( jQuery.noop ).done(function( value ) { + jQuery.Deferred().reject()[ "catch" ]( jQuery.noop ).done(function( value ) { assert.strictEqual( value, undefined, "then fail callback can return undefined/null" ); done.pop().call(); }); diff --git a/test/unit/effects.js b/test/unit/effects.js index 7aff2242a..47f8bdf0a 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1579,7 +1579,7 @@ test("Initial step callback should show element as :animated (#14623)", 1, funct var foo = jQuery( "#foo" ); foo.animate({ - opacity: 0, + opacity: 0 }, { duration: 100, step: function() { |