Skip to content

Commit 1c59b30

Browse files
committed
Build: Acknowledge Android 2.3 is not ES5-compatible
Android 2.3 chokes on unquoted reserved words being used as property names which was making Deferred tests not run. Acknowledge the sad fact that Android 2.3 is not ES5-compliant browser and enable the "es3" option in JSHint config. Fixes gh-2478 Closes gh-2481
1 parent bf591fb commit 1c59b30

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

src/.jshintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212

1313
"sub": true,
1414

15+
"es3": true,
16+
1517
"globals": {
1618
"window": true,
19+
"JSON": false,
1720

1821
"jQuery": true,
1922
"define": true,

test/.jshintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"undef": true,
1111
"unused": true,
1212

13+
"es3": true,
14+
1315
"evil": true,
1416
"sub": true,
1517

@@ -21,6 +23,7 @@
2123
"require": false,
2224
"define": false,
2325
"DOMParser": false,
26+
"JSON": false,
2427
"Promise": false,
2528
"Symbol": false,
2629
"QUnit": false,

test/unit/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ test("jQuery.parseJSON", function() {
14001400
deepEqual(
14011401
jQuery.parseJSON( "{ \"string\": \"\", \"number\": 4.2e+1, \"object\": {}," +
14021402
"\"array\": [[]], \"boolean\": [ true, false ], \"null\": null }"),
1403-
{ string: "", number: 42, object: {}, array: [[]], boolean: [ true, false ], "null": null },
1403+
{ string: "", number: 42, object: {}, array: [[]], "boolean": [ true, false ], "null": null },
14041404
"Dictionary of all data types"
14051405
);
14061406

test/unit/css.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ test( "Do not throw on frame elements from css method (#15098)", 1, function() {
12251225
if ( transformName ) {
12261226
equal( elemStyle[ transformName ], transformVal, "setting properly-prefixed transform" );
12271227
}
1228-
equal( elemStyle.undefined, undefined, "Nothing writes to node.style.undefined" );
1228+
equal( elemStyle[ "undefined" ], undefined, "Nothing writes to node.style.undefined" );
12291229
} );
12301230

12311231
test( "Don't detect fake set properties on a node when caching the prefixed version", function() {

test/unit/deferred.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ test( "jQuery.Deferred.catch", function( assert ) {
172172

173173
var value1, value2, value3,
174174
defer = jQuery.Deferred(),
175-
piped = defer.catch(function( a, b ) {
175+
piped = defer[ "catch" ](function( a, b ) {
176176
return a * b;
177177
}),
178178
done = jQuery.map( new Array( 3 ), function() { return assert.async(); } );
@@ -186,18 +186,18 @@ test( "jQuery.Deferred.catch", function( assert ) {
186186
value2 = b;
187187
});
188188

189-
defer.reject( 2, 3 ).catch(function() {
189+
defer.reject( 2, 3 )[ "catch" ](function() {
190190
assert.strictEqual( value1, 2, "first reject value ok" );
191191
assert.strictEqual( value2, 3, "second reject value ok" );
192192
assert.strictEqual( value3, 6, "result of filter ok" );
193193
done.pop().call();
194194
});
195195

196-
jQuery.Deferred().resolve().catch(function() {
196+
jQuery.Deferred().resolve()[ "catch" ](function() {
197197
assert.ok( false, "then should not be called on resolve" );
198198
}).then( done.pop() );
199199

200-
jQuery.Deferred().reject().catch( jQuery.noop ).done(function( value ) {
200+
jQuery.Deferred().reject()[ "catch" ]( jQuery.noop ).done(function( value ) {
201201
assert.strictEqual( value, undefined, "then fail callback can return undefined/null" );
202202
done.pop().call();
203203
});

test/unit/effects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ test("Initial step callback should show element as :animated (#14623)", 1, funct
15791579
var foo = jQuery( "#foo" );
15801580

15811581
foo.animate({
1582-
opacity: 0,
1582+
opacity: 0
15831583
}, {
15841584
duration: 100,
15851585
step: function() {

0 commit comments

Comments
 (0)