Build: ESLint details

Use eslint pragmas, fix new errors, etc

Closes gh-3148
This commit is contained in:
Oleg Gaidarenko 2016-05-10 12:12:28 +03:00
parent a4474c9a00
commit 58c6ca9822
46 changed files with 349 additions and 457 deletions

View File

@ -1,4 +1,6 @@
external external
node_modules
dist/jquery.min.js
test/data/jquery-1.9.1.js test/data/jquery-1.9.1.js
test/data/badcall.js test/data/badcall.js
test/data/badjson.js test/data/badjson.js
@ -8,5 +10,3 @@ test/data/readywaitloader.js
test/data/support/csp.js test/data/support/csp.js
test/data/support/getComputedSupport.js test/data/support/getComputedSupport.js
test/node_smoke_tests/lib/ensure_iterability.js test/node_smoke_tests/lib/ensure_iterability.js
node_modules
dist

146
.eslintrc
View File

@ -1,145 +1,7 @@
{ {
"env": {}, "extends": "eslint-config-jquery",
"globals": {}, "root": true,
"rules": { "env": {
"no-cond-assign": [ "node": true
"error",
"except-parens"
],
"curly": [
"error",
"all"
],
"object-curly-spacing": [
"error",
"always"
],
"computed-property-spacing": [
"error",
"always"
],
"array-bracket-spacing": [
"error",
"always"
],
"eqeqeq": [
"error",
"smart"
],
// Shows errors where jshint wouldn't (see jshint "expr" rule)
// clarifing this with eslint team
// "no-unused-expressions": "error",
"wrap-iife": [
"error",
"inside"
],
"no-caller": "error",
"quotes": [
"error",
"double",
"avoid-escape"
],
"no-undef": "error",
"no-unused-vars": "error",
"operator-linebreak": [
"error",
"after"
],
"comma-style": [
"error",
"last"
],
"camelcase": [
"error",
{
"properties": "never"
}
],
"dot-notation": [
"error",
{
"allowPattern": "^[a-z]+(_[a-z]+)+$"
}
],
"max-len": [
"error",
{
"code": 100,
"ignoreComments": true
}
],
"no-mixed-spaces-and-tabs": "error",
"no-trailing-spaces": "error",
"no-multi-str": "error",
"comma-dangle": [
"error",
"never"
],
"comma-spacing": [
"error",
{
"before": false,
"after": true
}
],
"space-before-blocks": [
"error",
"always"
],
"space-in-parens": [
"error",
"always"
],
"keyword-spacing": [
2
],
"semi": [
"error",
"always"
],
"semi-spacing": [
"error",
{
// Because of the `for ( ; ...)` requirement
// "before": true,
"after": true
}
],
"space-infix-ops": "error",
"eol-last": "error",
"lines-around-comment": [
"error",
{
"beforeLineComment": true
}
],
"linebreak-style": [
"error",
"unix"
],
"no-with": "error",
"brace-style": "error",
"space-before-function-paren": [
"error",
"never"
],
"no-loop-func": "error",
"no-spaced-func": "error",
"key-spacing": [
"error",
{
"beforeColon": false,
"afterColon": true
}
],
"space-unary-ops": [
"error",
{
"words": false,
"nonwords": false
}
],
"no-multiple-empty-lines": 2
} }
} }

2
.gitignore vendored
View File

@ -10,7 +10,7 @@
npm-debug.log npm-debug.log
/dist /dist/jquery*
/node_modules /node_modules
/test/node_smoke_tests/lib/ensure_iterability.js /test/node_smoke_tests/lib/ensure_iterability.js

View File

@ -1,10 +0,0 @@
external
test/data/jquery-1.9.1.js
test/data/badcall.js
test/data/badjson.js
test/data/json_obj.js
test/data/readywaitasset.js
test/data/readywaitloader.js
test/data/support/csp.js
test/data/support/getComputedSupport.js
test/node_smoke_tests/lib/ensure_iterability.js

View File

@ -180,7 +180,7 @@ module.exports = function( grunt ) {
// Integrate jQuery specific tasks // Integrate jQuery specific tasks
grunt.loadTasks( "build/tasks" ); grunt.loadTasks( "build/tasks" );
grunt.registerTask( "lint", [ "jsonlint" ] ); grunt.registerTask( "lint", [ "jsonlint", "eslint:all" ] );
// Don't run Node-related tests in Node.js < 1.0.0 as they require an old // Don't run Node-related tests in Node.js < 1.0.0 as they require an old
// jsdom version that needs compiling, making it harder for people to compile // jsdom version that needs compiling, making it harder for people to compile
@ -194,6 +194,7 @@ module.exports = function( grunt ) {
// Short list as a high frequency watch task // Short list as a high frequency watch task
grunt.registerTask( "dev", [ grunt.registerTask( "dev", [
"build:*:*", "build:*:*",
"newer:eslint:dev",
"uglify", "uglify",
"remove_map_comment", "remove_map_comment",
"dist:*" "dist:*"
@ -202,5 +203,5 @@ module.exports = function( grunt ) {
grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] ); grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] );
grunt.registerTask( "precommit_lint", [ "newer:jsonlint" ] ); grunt.registerTask( "precommit_lint", [ "newer:jsonlint", "newer:eslint:all" ] );
}; };

View File

@ -1,7 +0,0 @@
{
"env": {
"node": true
},
"extends": "../.eslintrc",
"root": true
}

View File

@ -21,6 +21,7 @@ module.exports = function( Release ) {
Release.define( { Release.define( {
npmPublish: true, npmPublish: true,
issueTracker: "github", issueTracker: "github",
/** /**
* Ensure the repo is in a proper state before release * Ensure the repo is in a proper state before release
* @param {Function} callback * @param {Function} callback
@ -28,6 +29,7 @@ module.exports = function( Release ) {
checkRepoState: function( callback ) { checkRepoState: function( callback ) {
ensureSizzle( Release, callback ); ensureSizzle( Release, callback );
}, },
/** /**
* Set the version in the src folder for distributing AMD * Set the version in the src folder for distributing AMD
*/ */
@ -37,6 +39,7 @@ module.exports = function( Release ) {
contents = contents.replace( /@VERSION/g, Release.newVersion ); contents = contents.replace( /@VERSION/g, Release.newVersion );
fs.writeFileSync( corePath, contents, "utf8" ); fs.writeFileSync( corePath, contents, "utf8" );
}, },
/** /**
* Generates any release artifacts that should be included in the release. * Generates any release artifacts that should be included in the release.
* The callback must be invoked with an array of files that should be * The callback must be invoked with an array of files that should be
@ -54,6 +57,7 @@ module.exports = function( Release ) {
Release._setSrcVersion(); Release._setSrcVersion();
callback( files ); callback( files );
}, },
/** /**
* Acts as insertion point for restoring Release.dir.repo * Acts as insertion point for restoring Release.dir.repo
* It was changed to reuse npm publish code in jquery-release * It was changed to reuse npm publish code in jquery-release
@ -65,6 +69,7 @@ module.exports = function( Release ) {
Release.dir.repo = Release.dir.origRepo || Release.dir.repo; Release.dir.repo = Release.dir.origRepo || Release.dir.repo;
return npmTags(); return npmTags();
}, },
/** /**
* Publish to distribution repo and npm * Publish to distribution repo and npm
* @param {Function} callback * @param {Function} callback

View File

@ -38,7 +38,7 @@ module.exports = function( grunt ) {
// Avoid breaking semicolons inserted by r.js // Avoid breaking semicolons inserted by r.js
skipSemiColonInsertion: true, skipSemiColonInsertion: true,
wrap: { wrap: {
start: wrapper[ 0 ].replace( /\/\*jshint .* \*\/\n/, "" ), start: wrapper[ 0 ].replace( /\/\*eslint .* \*\/\n/, "" ),
end: globals.replace( end: globals.replace(
/\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig, /\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
"" ""
@ -64,7 +64,12 @@ module.exports = function( grunt ) {
// Convert var modules // Convert var modules
if ( /.\/var\//.test( path.replace( process.cwd(), "" ) ) ) { if ( /.\/var\//.test( path.replace( process.cwd(), "" ) ) ) {
contents = contents contents = contents
.replace( /define\([\w\W]*?return/, "var " + ( /var\/([\w-]+)/.exec( name )[ 1 ] ) + " =" ) .replace(
/define\([\w\W]*?return/,
"var " +
( /var\/([\w-]+)/.exec( name )[ 1 ] ) +
" ="
)
.replace( rdefineEnd, "" ); .replace( rdefineEnd, "" );
// Sizzle treatment // Sizzle treatment
@ -130,6 +135,7 @@ module.exports = function( grunt ) {
excluded = [], excluded = [],
included = [], included = [],
version = grunt.config( "pkg.version" ), version = grunt.config( "pkg.version" ),
/** /**
* Recursively calls the excluder to remove on all modules in the list * Recursively calls the excluder to remove on all modules in the list
* @param {Array} list * @param {Array} list
@ -167,6 +173,7 @@ module.exports = function( grunt ) {
} ); } );
} }
}, },
/** /**
* Adds the specified module to the excluded or included list, depending on the flag * Adds the specified module to the excluded or included list, depending on the flag
* @param {String} flag A module path relative to * @param {String} flag A module path relative to

View File

@ -1,5 +1,3 @@
/* jshint node: true */
"use strict"; "use strict";
// Run Node with provided parameters: the first one being the Grunt // Run Node with provided parameters: the first one being the Grunt
@ -13,4 +11,4 @@ module.exports = function spawnTest( done ) {
.on( "close", function( code ) { .on( "close", function( code ) {
done( code === 0 ); done( code === 0 );
} ); } );
} ; };

17
dist/.eslintrc vendored Normal file
View File

@ -0,0 +1,17 @@
{
"extends": "../src/.eslintrc",
"rules": {
// That is okay for built version
"no-multiple-empty-lines": "off",
// Because sizze is not compatible to jquery code style
"lines-around-comment": "off",
"space-in-parens": "off",
"camelcase": "off",
"computed-property-spacing": "off",
"max-len": "off",
"dot-notation": "off",
"semi-spacing": "off",
"brace-style": "off"
}
}

View File

@ -29,6 +29,7 @@
"commitplease": "2.3.1", "commitplease": "2.3.1",
"core-js": "2.2.2", "core-js": "2.2.2",
"cross-spawn": "2.2.3", "cross-spawn": "2.2.3",
"eslint-config-jquery": "0.1.2",
"grunt": "1.0.1", "grunt": "1.0.1",
"grunt-babel": "6.0.0", "grunt-babel": "6.0.0",
"grunt-cli": "1.2.0", "grunt-cli": "1.2.0",

View File

@ -1,15 +1,18 @@
{ {
"env": { // Support: IE <=9 only, Android <=4.0 only
"browser" // The above browsers are failing a lot of tests in the ES5
// test suite at http://test262.ecmascript.org.
"parserOptions": {
"ecmaVersion": 3
}, },
"extends": "../.eslintrc",
"root": true,
"globals": { "globals": {
"window": true, "window": true,
"JSON": false,
"jQuery": true, "jQuery": true,
"define": true, "define": true,
"module": true, "module": true,
"noGlobal": true "noGlobal": true
},
"rules": {
"strict": ["error", "function"]
} }
} }

View File

@ -306,6 +306,7 @@ jQuery.extend( {
processData: true, processData: true,
async: true, async: true,
contentType: "application/x-www-form-urlencoded; charset=UTF-8", contentType: "application/x-www-form-urlencoded; charset=UTF-8",
/* /*
timeout: 0, timeout: 0,
data: null, data: null,

View File

@ -143,11 +143,16 @@ jQuery.extend( {
while ( i-- ) { while ( i-- ) {
option = options[ i ]; option = options[ i ];
/* eslint-disable no-cond-assign */
if ( option.selected = if ( option.selected =
jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
) { ) {
optionSet = true; optionSet = true;
} }
/* eslint-enable no-cond-assign */
} }
// Force browsers to behave consistently when non-matching value is set // Force browsers to behave consistently when non-matching value is set

View File

@ -1,3 +1,7 @@
/* global Symbol */
// Defining this global in .eslintrc would create a danger of using the global
// unguarded in another place, it seems safer to define global only for this module
define( [ define( [
"./var/arr", "./var/arr",
"./var/document", "./var/document",
@ -252,7 +256,11 @@ jQuery.extend( {
}, },
isEmptyObject: function( obj ) { isEmptyObject: function( obj ) {
/* eslint-disable no-unused-vars */
// See https://github.com/eslint/eslint/issues/6125
var name; var name;
for ( name in obj ) { for ( name in obj ) {
return false; return false;
} }
@ -442,15 +450,9 @@ jQuery.extend( {
support: support support: support
} ); } );
// JSHint would error on this code due to the Symbol not being defined in ES5.
// Defining this global in .jshintrc would create a danger of using the global
// unguarded in another place, it seems safer to just disable JSHint for these
// three lines.
/* jshint ignore: start */
if ( typeof Symbol === "function" ) { if ( typeof Symbol === "function" ) {
jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
} }
/* jshint ignore: end */
// Populate the class2type map // Populate the class2type map
jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),

View File

@ -10,8 +10,12 @@ function adjustCSS( elem, prop, valueParts, tween ) {
scale = 1, scale = 1,
maxIterations = 20, maxIterations = 20,
currentValue = tween ? currentValue = tween ?
function() { return tween.cur(); } : function() {
function() { return jQuery.css( elem, prop, "" ); }, return tween.cur();
} :
function() {
return jQuery.css( elem, prop, "" );
},
initial = currentValue(), initial = currentValue(),
unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),

View File

@ -13,7 +13,6 @@ return function( owner ) {
// - Node.DOCUMENT_NODE // - Node.DOCUMENT_NODE
// - Object // - Object
// - Any // - Any
/* jshint -W018 */
return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
}; };

View File

@ -37,7 +37,7 @@ function adoptValue( value, resolve, reject ) {
// For Promises/A+, convert exceptions into rejections // For Promises/A+, convert exceptions into rejections
// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in // Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
// Deferred#then to conditionally suppress rejection. // Deferred#then to conditionally suppress rejection.
} catch ( /*jshint -W002 */ value ) { } catch ( value ) {
// Support: Android 4.0 only // Support: Android 4.0 only
// Strict mode functions invoked without .call/.apply get global-object context // Strict mode functions invoked without .call/.apply get global-object context

16
src/effects.js vendored
View File

@ -51,7 +51,7 @@ function genFx( type, includeWidth ) {
// If we include width, step value is 1 to do all cssExpand values, // If we include width, step value is 1 to do all cssExpand values,
// otherwise step value is 2 to skip over Left and Right // otherwise step value is 2 to skip over Left and Right
includeWidth = includeWidth ? 1 : 0; includeWidth = includeWidth ? 1 : 0;
for ( ; i < 4 ; i += 2 - includeWidth ) { for ( ; i < 4; i += 2 - includeWidth ) {
which = cssExpand[ i ]; which = cssExpand[ i ];
attrs[ "margin" + which ] = attrs[ "padding" + which ] = type; attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
} }
@ -78,7 +78,6 @@ function createTween( value, prop, animation ) {
} }
function defaultPrefilter( elem, props, opts ) { function defaultPrefilter( elem, props, opts ) {
/* jshint validthis: true */
var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display, var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
isBox = "width" in props || "height" in props, isBox = "width" in props || "height" in props,
anim = this, anim = this,
@ -220,9 +219,12 @@ function defaultPrefilter( elem, props, opts ) {
showHide( [ elem ], true ); showHide( [ elem ], true );
} }
/* jshint -W083 */ /* eslint-disable no-loop-func */
anim.done( function() { anim.done( function() {
/* eslint-enable no-loop-func */
// The final step of a "hide" animation is actually hiding the element // The final step of a "hide" animation is actually hiding the element
if ( !hidden ) { if ( !hidden ) {
showHide( [ elem ] ); showHide( [ elem ] );
@ -307,7 +309,7 @@ function Animation( elem, properties, options ) {
index = 0, index = 0,
length = animation.tweens.length; length = animation.tweens.length;
for ( ; index < length ; index++ ) { for ( ; index < length; index++ ) {
animation.tweens[ index ].run( percent ); animation.tweens[ index ].run( percent );
} }
@ -348,7 +350,7 @@ function Animation( elem, properties, options ) {
return this; return this;
} }
stopped = true; stopped = true;
for ( ; index < length ; index++ ) { for ( ; index < length; index++ ) {
animation.tweens[ index ].run( 1 ); animation.tweens[ index ].run( 1 );
} }
@ -366,7 +368,7 @@ function Animation( elem, properties, options ) {
propFilter( props, animation.opts.specialEasing ); propFilter( props, animation.opts.specialEasing );
for ( ; index < length ; index++ ) { for ( ; index < length; index++ ) {
result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts ); result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
if ( result ) { if ( result ) {
if ( jQuery.isFunction( result.stop ) ) { if ( jQuery.isFunction( result.stop ) ) {
@ -420,7 +422,7 @@ jQuery.Animation = jQuery.extend( Animation, {
index = 0, index = 0,
length = props.length; length = props.length;
for ( ; index < length ; index++ ) { for ( ; index < length; index++ ) {
prop = props[ index ]; prop = props[ index ];
Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || []; Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
Animation.tweeners[ prop ].unshift( callback ); Animation.tweeners[ prop ].unshift( callback );

View File

@ -2,7 +2,7 @@
// This file is included in a different way from all the others // This file is included in a different way from all the others
// so the "use strict" pragma is not needed. // so the "use strict" pragma is not needed.
/* jshint strict: false */ /* eslint strict: "off" */
/* ExcludeEnd */ /* ExcludeEnd */

View File

@ -29,8 +29,14 @@ define( [
"use strict"; "use strict";
var var
/* eslint-disable max-len */
// See https://github.com/eslint/eslint/issues/3229
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi, rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
/* eslint-enable */
// Support: IE <=10 - 11, Edge 12 - 13 // Support: IE <=10 - 11, Edge 12 - 13
// In IE/Edge using regex groups here causes severe slowdowns. // In IE/Edge using regex groups here causes severe slowdowns.
// See https://connect.microsoft.com/IE/feedback/details/1736512/ // See https://connect.microsoft.com/IE/feedback/details/1736512/

View File

@ -1 +1,3 @@
define( [ "./selector-sizzle" ], function() {} ); define( [ "./selector-sizzle" ], function() {
"use strict";
} );

View File

@ -13,7 +13,6 @@ var risSimple = /^.[^:#\[\.,]*$/;
function winnow( elements, qualifier, not ) { function winnow( elements, qualifier, not ) {
if ( jQuery.isFunction( qualifier ) ) { if ( jQuery.isFunction( qualifier ) ) {
return jQuery.grep( elements, function( elem, i ) { return jQuery.grep( elements, function( elem, i ) {
/* jshint -W018 */
return !!qualifier.call( elem, i, elem ) !== not; return !!qualifier.call( elem, i, elem ) !== not;
} ); } );

View File

@ -1,4 +1,4 @@
/*jshint unused:false */ /*eslint-disable no-unused-vars*/
/*! /*!
* jQuery JavaScript Library v@VERSION * jQuery JavaScript Library v@VERSION
* https://jquery.com/ * https://jquery.com/
@ -38,7 +38,7 @@
} }
// Pass this if window is not defined yet // Pass this if window is not defined yet
}( typeof window !== "undefined" ? window : this, function( window, noGlobal ) { } )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1 // Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode // throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
@ -50,4 +50,4 @@
// build.js inserts compiled jQuery here // build.js inserts compiled jQuery here
return jQuery; return jQuery;
} ) ); } );

View File

@ -2,8 +2,12 @@
"env": { "env": {
"browser": true "browser": true
}, },
"extends": "../.eslintrc", // Support: IE <=9 only, Android <=4.0 only
"root": true, // The above browsers are failing a lot of tests in the ES5
// test suite at http://test262.ecmascript.org.
"parserOptions": {
"ecmaVersion": 3
},
"globals": { "globals": {
"require": false, "require": false,
"define": false, "define": false,
@ -38,7 +42,7 @@
"externalHost": true "externalHost": true
}, },
"rules": { "rules": {
// See https://github.com/eslint/eslint/issues/6125 // See https://github.com/eslint/eslint/issues/2342
"no-unused-vars": "off", "no-unused-vars": "off",
// Too much errors // Too much errors
@ -48,7 +52,7 @@
"camelcase": "off", "camelcase": "off",
"dot-notaion": "off", "dot-notaion": "off",
// Not a lot really too much, but waiting for autofix for these rules // Not really too much - waiting autofix features for these rules
"lines-around-comment": "off", "lines-around-comment": "off",
"dot-notation": "off" "dot-notation": "off"
} }

View File

@ -1,7 +1,6 @@
/*jshint multistr:true, quotmark:false */ /* eslint no-multi-str: "off" */
var fireNative, originaljQuery, original$, var baseURL = "",
baseURL = "",
supportjQuery = this.jQuery, supportjQuery = this.jQuery,
// see RFC 2606 // see RFC 2606
@ -12,8 +11,8 @@ this.isLocal = window.location.protocol === "file:";
// Setup global variables before loading jQuery for testing .noConflict() // Setup global variables before loading jQuery for testing .noConflict()
supportjQuery.noConflict( true ); supportjQuery.noConflict( true );
originaljQuery = this.jQuery = undefined; window.originaljQuery = this.jQuery = undefined;
original$ = this.$ = "replaced"; window.original$ = this.$ = "replaced";
/** /**
* Returns an array of elements with the given IDs * Returns an array of elements with the given IDs
@ -44,7 +43,7 @@ function match( message, selector, expectedIds, context ) {
i = 0; i = 0;
for ( ; i < f.length; i++ ) { for ( ; i < f.length; i++ ) {
s += ( s && "," ) + '"' + f[ i ].id + '"'; s += ( s && "," ) + "\"" + f[ i ].id + "\"";
} }
this.deepEqual( f, q.apply( q, expectedIds ), message + " (" + selector + ")" ); this.deepEqual( f, q.apply( q, expectedIds ), message + " (" + selector + ")" );
@ -75,38 +74,38 @@ QUnit.assert.selectInFixture = function( message, selector, expectedIds ) {
}; };
this.createDashboardXML = function() { this.createDashboardXML = function() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \ var string = "<?xml version='1.0' encoding='UTF-8'?> \
<dashboard> \ <dashboard> \
<locations class="foo"> \ <locations class='foo'> \
<location for="bar" checked="different"> \ <location for='bar' checked='different'> \
<infowindowtab normal="ab" mixedCase="yes"> \ <infowindowtab normal='ab' mixedCase='yes'> \
<tab title="Location"><![CDATA[blabla]]></tab> \ <tab title='Location'><![CDATA[blabla]]></tab> \
<tab title="Users"><![CDATA[blublu]]></tab> \ <tab title='Users'><![CDATA[blublu]]></tab> \
</infowindowtab> \ </infowindowtab> \
</location> \ </location> \
</locations> \ </locations> \
</dashboard>'; </dashboard>";
return jQuery.parseXML( string ); return jQuery.parseXML( string );
}; };
this.createWithFriesXML = function() { this.createWithFriesXML = function() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \ var string = "<?xml version='1.0' encoding='UTF-8'?> \
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" \ <soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/' \
xmlns:xsd="http://www.w3.org/2001/XMLSchema" \ xmlns:xsd='http://www.w3.org/2001/XMLSchema' \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> \
<soap:Body> \ <soap:Body> \
<jsconf xmlns="http://{{ externalHost }}/ns1"> \ <jsconf xmlns='http://{{ externalHost }}/ns1'> \
<response xmlns:ab="http://{{ externalHost }}/ns2"> \ <response xmlns:ab='http://{{ externalHost }}/ns2'> \
<meta> \ <meta> \
<component id="seite1" class="component"> \ <component id='seite1' class='component'> \
<properties xmlns:cd="http://{{ externalHost }}/ns3"> \ <properties xmlns:cd='http://{{ externalHost }}/ns3'> \
<property name="prop1"> \ <property name='prop1'> \
<thing /> \ <thing /> \
<value>1</value> \ <value>1</value> \
</property> \ </property> \
<property name="prop2"> \ <property name='prop2'> \
<thing att="something" /> \ <thing att='something' /> \
</property> \ </property> \
<foo_bar>foo</foo_bar> \ <foo_bar>foo</foo_bar> \
</properties> \ </properties> \
@ -115,7 +114,7 @@ this.createWithFriesXML = function() {
</response> \ </response> \
</jsconf> \ </jsconf> \
</soap:Body> \ </soap:Body> \
</soap:Envelope>'; </soap:Envelope>";
return jQuery.parseXML( string.replace( /\{\{\s*externalHost\s*\}\}/g, externalHost ) ); return jQuery.parseXML( string.replace( /\{\{\s*externalHost\s*\}\}/g, externalHost ) );
}; };
@ -123,7 +122,7 @@ this.createWithFriesXML = function() {
this.createXMLFragment = function() { this.createXMLFragment = function() {
var xml, frag; var xml, frag;
if ( window.ActiveXObject ) { if ( window.ActiveXObject ) {
xml = new ActiveXObject( "msxml2.domdocument" ); xml = new window.ActiveXObject( "msxml2.domdocument" );
} else { } else {
xml = document.implementation.createDocument( "", "", null ); xml = document.implementation.createDocument( "", "", null );
} }
@ -135,7 +134,7 @@ this.createXMLFragment = function() {
return frag; return frag;
}; };
fireNative = document.createEvent ? window.fireNative = document.createEvent ?
function( node, type ) { function( node, type ) {
var event = document.createEvent( "HTMLEvents" ); var event = document.createEvent( "HTMLEvents" );
@ -263,8 +262,8 @@ QUnit.config.autostart = false;
this.loadTests = function() { this.loadTests = function() {
// Leverage QUnit URL parsing to detect testSwarm environment and "basic" testing mode // Leverage QUnit URL parsing to detect testSwarm environment and "basic" testing mode
QUnit.isSwarm = ( QUnit.urlParams[ "swarmURL" ] + "" ).indexOf( "http" ) === 0; QUnit.isSwarm = ( QUnit.urlParams.swarmURL + "" ).indexOf( "http" ) === 0;
QUnit.basicTests = ( QUnit.urlParams[ "module" ] + "" ) === "basic"; QUnit.basicTests = ( QUnit.urlParams.module + "" ) === "basic";
// Get testSubproject from testrunner first // Get testSubproject from testrunner first
require( [ "data/testrunner.js" ], function() { require( [ "data/testrunner.js" ], function() {

View File

@ -1,10 +1,7 @@
{ {
"env": { "env": {
"node": true "es6": true
}, },
"parserOptions": { "extends" : "../../.eslintrc",
"ecmaVersion": 6
},
"extends": "../.eslintrc",
"root": true "root": true
} }

View File

@ -1,5 +1,3 @@
/* jshint esnext: true */
"use strict"; "use strict";
var assert = require( "assert" ); var assert = require( "assert" );

View File

@ -1,5 +1,3 @@
/* jshint esnext: true */
"use strict"; "use strict";
var assert = require( "assert" ); var assert = require( "assert" );

View File

@ -1,7 +1,4 @@
{ {
"env": { "extends": "../../.eslintrc",
"node": true
},
"extends": "../.eslintrc",
"root": true "root": true
} }

View File

@ -99,7 +99,7 @@ QUnit.module( "ajax", {
assert.ok( true, "success" ); assert.ok( true, "success" );
}, },
fail: function() { fail: function() {
if (jQuery.support.cors === false) { if ( jQuery.support.cors === false ) {
assert.ok( true, "fail" ); assert.ok( true, "fail" );
} }
}, },
@ -1737,11 +1737,11 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
} else { } else {
// No built-in support for binary data, but it's easy to add via a prefilter // No built-in support for binary data, but it's easy to add via a prefilter
jQuery.ajaxPrefilter( "arraybuffer", function ( s ) { jQuery.ajaxPrefilter( "arraybuffer", function( s ) {
s.xhrFields = { responseType: "arraybuffer" }; s.xhrFields = { responseType: "arraybuffer" };
s.responseFields.arraybuffer = "response"; s.responseFields.arraybuffer = "response";
s.converters[ "binary arraybuffer" ] = true; s.converters[ "binary arraybuffer" ] = true;
}); } );
ajaxTest( "gh-2498 - jQuery.ajax() - binary data shouldn't throw an exception", 2, function( assert ) { ajaxTest( "gh-2498 - jQuery.ajax() - binary data shouldn't throw an exception", 2, function( assert ) {
return { return {
@ -1961,7 +1961,7 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
url: url( "data/ajax/content-type.php" ), url: url( "data/ajax/content-type.php" ),
data: { data: {
"content-type": "test/jsontest", "content-type": "test/jsontest",
"response": JSON.stringify({test: "test"}) "response": JSON.stringify( { test: "test" } )
}, },
success: function( result ) { success: function( result ) {
assert.strictEqual( assert.strictEqual(

View File

@ -758,9 +758,9 @@ QUnit.test( "prop('tabindex')", function( assert ) {
QUnit.test( "image.prop( 'tabIndex' )", function( assert ) { QUnit.test( "image.prop( 'tabIndex' )", function( assert ) {
assert.expect( 1 ); assert.expect( 1 );
var image = jQuery("<img src='data/1x1.jpg' />") var image = jQuery( "<img src='data/1x1.jpg' />" )
.appendTo("#qunit-fixture"); .appendTo( "#qunit-fixture" );
assert.equal( image.prop("tabIndex" ), -1, "tabIndex on image" ); assert.equal( image.prop( "tabIndex" ), -1, "tabIndex on image" );
} ); } );
QUnit.test( "prop('tabindex', value)", function( assert ) { QUnit.test( "prop('tabindex', value)", function( assert ) {

View File

@ -95,7 +95,7 @@ QUnit.test( "jQuery()", function( assert ) {
assert.equal( div.length, 4, "Correct number of elements generated for div hr code b" ); assert.equal( div.length, 4, "Correct number of elements generated for div hr code b" );
assert.equal( div.parent().length, 0, "Make sure that the generated HTML has no parent." ); assert.equal( div.parent().length, 0, "Make sure that the generated HTML has no parent." );
assert.equal( jQuery( [ 1,2,3 ] ).get( 1 ), 2, "Test passing an array to the factory" ); assert.equal( jQuery( [ 1, 2, 3 ] ).get( 1 ), 2, "Test passing an array to the factory" );
assert.equal( jQuery( document.body ).get( 0 ), jQuery( "body" ).get( 0 ), "Test passing an html node to the factory" ); assert.equal( jQuery( document.body ).get( 0 ), jQuery( "body" ).get( 0 ), "Test passing an html node to the factory" );
@ -274,7 +274,7 @@ QUnit.test( "type", function( assert ) {
QUnit.test( "type for `Symbol`", function( assert ) { QUnit.test( "type for `Symbol`", function( assert ) {
// Prevent reference errors // Prevent reference errors
if( typeof Symbol !== "function" ) { if ( typeof Symbol !== "function" ) {
assert.expect( 0 ); assert.expect( 0 );
return; return;
} }
@ -283,7 +283,7 @@ QUnit.test( "type for `Symbol`", function( assert ) {
assert.equal( jQuery.type( Symbol() ), "symbol", "Symbol" ); assert.equal( jQuery.type( Symbol() ), "symbol", "Symbol" );
assert.equal( jQuery.type( Object( Symbol() ) ), "symbol", "Symbol" ); assert.equal( jQuery.type( Object( Symbol() ) ), "symbol", "Symbol" );
}); } );
QUnit.asyncTest( "isPlainObject", function( assert ) { QUnit.asyncTest( "isPlainObject", function( assert ) {
@ -968,7 +968,7 @@ QUnit.test( "jQuery.map", function( assert ) {
assert.ok( !result, "empty NodeList treated like array" ); assert.ok( !result, "empty NodeList treated like array" );
result = jQuery.map( Array( 4 ), function( v, k ) { result = jQuery.map( Array( 4 ), function( v, k ) {
return k % 2 ? k : [ k,k,k ]; return k % 2 ? k : [ k, k, k ];
} ); } );
assert.equal( result.join( "" ), "00012223", "Array results flattened (#2616)" ); assert.equal( result.join( "" ), "00012223", "Array results flattened (#2616)" );
} ); } );
@ -1120,7 +1120,7 @@ QUnit.test( "jQuery.grep(Array-like)", function( assert ) {
[], [],
"Satisfying elements absent, Array-like object used, and grep explicitly uninverted" "Satisfying elements absent, Array-like object used, and grep explicitly uninverted"
); );
}); } );
QUnit.test( "jQuery.extend(Object, Object)", function( assert ) { QUnit.test( "jQuery.extend(Object, Object)", function( assert ) {
assert.expect( 28 ); assert.expect( 28 );
@ -1238,19 +1238,19 @@ QUnit.test( "jQuery.extend(Object, Object)", function( assert ) {
QUnit.test( "jQuery.extend(Object, Object {created with \"defineProperties\"})", function( assert ) { QUnit.test( "jQuery.extend(Object, Object {created with \"defineProperties\"})", function( assert ) {
assert.expect( 2 ); assert.expect( 2 );
var definedObj = Object.defineProperties({}, { var definedObj = Object.defineProperties( {}, {
"enumerableProp": { "enumerableProp": {
get: function () { get: function() {
return true; return true;
}, },
enumerable: true enumerable: true
}, },
"nonenumerableProp": { "nonenumerableProp": {
get: function () { get: function() {
return true; return true;
} }
} }
}), } ),
accessorObj = {}; accessorObj = {};
jQuery.extend( accessorObj, definedObj ); jQuery.extend( accessorObj, definedObj );
@ -1308,7 +1308,7 @@ QUnit.test( "jQuery.each(Object,Function)", function( assert ) {
assert.deepEqual( seen, [ 1, 2 ], "Broken array iteration" ); assert.deepEqual( seen, [ 1, 2 ], "Broken array iteration" );
seen = []; seen = [];
jQuery.each( { "a": 1, "b": 2,"c": 3 }, function( k, v ) { jQuery.each( { "a": 1, "b": 2, "c": 3 }, function( k, v ) {
seen.push( v ); seen.push( v );
return false; return false;
} ); } );
@ -1428,7 +1428,7 @@ QUnit.test( "jQuery.makeArray", function( assert ) {
assert.equal( ( function() { return jQuery.makeArray( arguments ); } )( 1, 2 ).join( "" ), "12", "Pass makeArray an arguments array" ); assert.equal( ( function() { return jQuery.makeArray( arguments ); } )( 1, 2 ).join( "" ), "12", "Pass makeArray an arguments array" );
assert.equal( jQuery.makeArray( [ 1,2,3 ] ).join( "" ), "123", "Pass makeArray a real array" ); assert.equal( jQuery.makeArray( [ 1, 2, 3 ] ).join( "" ), "123", "Pass makeArray a real array" );
assert.equal( jQuery.makeArray().length, 0, "Pass nothing to makeArray and expect an empty array" ); assert.equal( jQuery.makeArray().length, 0, "Pass nothing to makeArray and expect an empty array" );
@ -1692,7 +1692,6 @@ testIframe(
); );
QUnit.test( "Iterability of jQuery objects (gh-1693)", function( assert ) { QUnit.test( "Iterability of jQuery objects (gh-1693)", function( assert ) {
/* jshint unused: false */
assert.expect( 1 ); assert.expect( 1 );
var i, elem, result; var i, elem, result;

View File

@ -141,7 +141,7 @@ QUnit.test( "css() explicit and relative values", function( assert ) {
$elem.css( "width", "+=9" ); $elem.css( "width", "+=9" );
assert.equal( $elem.css( "width" ), "10px", "'+=9' on width (params)" ); assert.equal( $elem.css( "width" ), "10px", "'+=9' on width (params)" );
$elem.css( "width", "-=9" ) ; $elem.css( "width", "-=9" );
assert.equal( $elem.css( "width" ), "1px", "'-=9' on width (params)" ); assert.equal( $elem.css( "width" ), "1px", "'-=9' on width (params)" );
$elem.css( "width", "+=9px" ); $elem.css( "width", "+=9px" );
@ -988,18 +988,18 @@ QUnit.test( "computed margins (trac-3333; gh-2237)", function( assert ) {
assert.equal( $div.css( "marginRight" ), "0px", assert.equal( $div.css( "marginRight" ), "0px",
"marginRight correctly calculated with a width and display block" ); "marginRight correctly calculated with a width and display block" );
$div.css({ $div.css( {
position: "absolute", position: "absolute",
top: 0, top: 0,
left: 0, left: 0,
width: "100px" width: "100px"
}); } );
$child.css({ $child.css( {
width: "50px", width: "50px",
margin: "auto" margin: "auto"
}); } );
assert.equal( $child.css( "marginLeft" ), "25px", "auto margins are computed to pixels" ); assert.equal( $child.css( "marginLeft" ), "25px", "auto margins are computed to pixels" );
}); } );
QUnit.test( "box model properties incorrectly returning % instead of px, see #10639 and #12088", function( assert ) { QUnit.test( "box model properties incorrectly returning % instead of px, see #10639 and #12088", function( assert ) {
assert.expect( 2 ); assert.expect( 2 );
@ -1309,7 +1309,7 @@ QUnit[ jQuery.find.compile ? "test" : "skip" ]( ":visible/:hidden selectors", fu
assert.t( "Is Visible", "#qunit-fixture div:visible:lt(2)", [ "foo", "nothiddendiv" ] ); assert.t( "Is Visible", "#qunit-fixture div:visible:lt(2)", [ "foo", "nothiddendiv" ] );
assert.t( "Is Not Hidden", "#qunit-fixture:hidden", [] ); assert.t( "Is Not Hidden", "#qunit-fixture:hidden", [] );
assert.t( "Is Hidden", "#form input:hidden", [ "hidden1","hidden2" ] ); assert.t( "Is Hidden", "#form input:hidden", [ "hidden1", "hidden2" ] );
$a = jQuery( "<a href='#'><h1>Header</h1></a>" ).appendTo( "#qunit-fixture" ); $a = jQuery( "<a href='#'><h1>Header</h1></a>" ).appendTo( "#qunit-fixture" );
assert.ok( $a.is( ":visible" ), "Anchor tag with flow content is visible (gh-2227)" ); assert.ok( $a.is( ":visible" ), "Anchor tag with flow content is visible (gh-2227)" );
@ -1345,7 +1345,7 @@ QUnit.test(
name: "backgroundAttachment", name: "backgroundAttachment",
value: [ "fixed" ], value: [ "fixed" ],
expected: [ "scroll" ] expected: [ "scroll" ]
},{ }, {
name: "backgroundColor", name: "backgroundColor",
value: [ "rgb(255, 0, 0)", "rgb(255,0,0)", "#ff0000" ], value: [ "rgb(255, 0, 0)", "rgb(255,0,0)", "#ff0000" ],
expected: [ "transparent" ] expected: [ "transparent" ]

View File

@ -409,7 +409,7 @@ QUnit.test( "data-* attributes", function( assert ) {
break; break;
case 3: case 3:
assert.equal( jQuery( elem ).data( "number" ), true, "Check number property" ); assert.equal( jQuery( elem ).data( "number" ), true, "Check number property" );
assert.deepEqual( jQuery( elem ).data( "stuff" ), [ 2,8 ], "Check stuff property" ); assert.deepEqual( jQuery( elem ).data( "stuff" ), [ 2, 8 ], "Check stuff property" );
break; break;
default: default:
assert.ok( false, [ "Assertion failed on index ", index, ", with data" ].join( "" ) ); assert.ok( false, [ "Assertion failed on index ", index, ", with data" ].join( "" ) );
@ -881,13 +881,13 @@ QUnit.test( "Check that the expando is removed when there's no more data", funct
assert.strictEqual( div[ 0 ][ key ], undefined, "Expando was not removed when there was no more data" ); assert.strictEqual( div[ 0 ][ key ], undefined, "Expando was not removed when there was no more data" );
} }
} }
}); } );
QUnit.test( "Check that the expando is removed when there's no more data on non-nodes", function( assert ) { QUnit.test( "Check that the expando is removed when there's no more data on non-nodes", function( assert ) {
assert.expect( 1 ); assert.expect( 1 );
var key, var key,
obj = jQuery( {key: 42} ); obj = jQuery( { key: 42 } );
obj.data( "some", "data" ); obj.data( "some", "data" );
assert.equal( obj.data( "some" ), "data", "Data is added" ); assert.equal( obj.data( "some" ), "data", "Data is added" );
obj.removeData( "some" ); obj.removeData( "some" );

View File

@ -808,7 +808,7 @@ QUnit.test( "jQuery.when(nonThenable) - like Promise.resolve", function( assert
// Support: Android 4.0 only // Support: Android 4.0 only
// Strict mode functions invoked without .call/.apply get global-object context // Strict mode functions invoked without .call/.apply get global-object context
defaultContext = (function getDefaultContext() { return this; }).call(), defaultContext = ( function getDefaultContext() { return this; } ).call(),
done = assert.async( 20 ); done = assert.async( 20 );
@ -915,7 +915,7 @@ QUnit.test( "jQuery.when(thenable) - like Promise.resolve", function( assert ) {
// Support: Android 4.0 only // Support: Android 4.0 only
// Strict mode functions invoked without .call/.apply get global-object context // Strict mode functions invoked without .call/.apply get global-object context
defaultContext = (function getDefaultContext() { return this; }).call(), defaultContext = ( function getDefaultContext() { return this; } ).call(),
done = assert.async( CASES * 2 ); done = assert.async( CASES * 2 );
@ -995,7 +995,7 @@ QUnit.test( "jQuery.when(a, b) - like Promise.all", function( assert ) {
// Support: Android 4.0 only // Support: Android 4.0 only
// Strict mode functions invoked without .call/.apply get global-object context // Strict mode functions invoked without .call/.apply get global-object context
defaultContext = (function getDefaultContext() { return this; }).call(), defaultContext = ( function getDefaultContext() { return this; } ).call(),
done = assert.async( 98 ); done = assert.async( 98 );

View File

@ -14,7 +14,7 @@ QUnit.test( "bind/unbind", function( assert ) {
assert.equal( e.type, "click", "correct event type" ); assert.equal( e.type, "click", "correct event type" );
assert.equal( e.data.bindData, 19, "correct trigger data" ); assert.equal( e.data.bindData, 19, "correct trigger data" );
assert.equal( trig, 42, "correct bind data" ); assert.equal( trig, 42, "correct bind data" );
assert.equal( e.target.nodeName.toLowerCase(), "b" , "correct element" ); assert.equal( e.target.nodeName.toLowerCase(), "b", "correct element" );
} ) } )
.trigger( "click", [ 42 ] ) .trigger( "click", [ 42 ] )
.unbind( "click" ) .unbind( "click" )
@ -32,7 +32,7 @@ QUnit.test( "delegate/undelegate", function( assert ) {
markup markup
.delegate( "b", "click", function( e ) { .delegate( "b", "click", function( e ) {
assert.equal( e.type, "click", "correct event type" ); assert.equal( e.type, "click", "correct event type" );
assert.equal( e.target.nodeName.toLowerCase(), "b" , "correct element" ); assert.equal( e.target.nodeName.toLowerCase(), "b", "correct element" );
} ) } )
.find( "b" ) .find( "b" )
.trigger( "click" ) .trigger( "click" )

View File

@ -408,7 +408,7 @@ QUnit.test( "passing undefined is a setter #5571", function( assert ) {
QUnit.test( "setters with and without box-sizing:border-box", function( assert ) { QUnit.test( "setters with and without box-sizing:border-box", function( assert ) {
assert.expect( 120 ); assert.expect( 120 );
var parent = jQuery( "#foo" ).css({ width: "200px", height: "200px", "font-size": "16px" }), var parent = jQuery( "#foo" ).css( { width: "200px", height: "200px", "font-size": "16px" } ),
el_bb = jQuery( "<div style='margin:5px;padding:1px;border:2px solid black;box-sizing:border-box;'></div>" ).appendTo( parent ), el_bb = jQuery( "<div style='margin:5px;padding:1px;border:2px solid black;box-sizing:border-box;'></div>" ).appendTo( parent ),
el = jQuery( "<div style='margin:5px;padding:1px;border:2px solid black;'></div>" ).appendTo( parent ), el = jQuery( "<div style='margin:5px;padding:1px;border:2px solid black;'></div>" ).appendTo( parent ),
el_bb_np = jQuery( "<div style='margin:5px; padding:0px; border:0px solid green;box-sizing:border-box;'></div>" ).appendTo( parent ), el_bb_np = jQuery( "<div style='margin:5px; padding:0px; border:0px solid green;box-sizing:border-box;'></div>" ).appendTo( parent ),
@ -520,9 +520,9 @@ QUnit.test( "outside view position (gh-2836)", function( assert ) {
parent.one( "scroll", function() { parent.one( "scroll", function() {
var pos = parent.find( "div" ).eq( 3 ).position(); var pos = parent.find( "div" ).eq( 3 ).position();
assert.strictEqual(pos.top, -100); assert.strictEqual( pos.top, -100 );
stop(); stop();
}); } );
parent.scrollTop( 400 ); parent.scrollTop( 400 );
} ); } );

View File

@ -538,7 +538,7 @@ QUnit.test( "animate duration 0", function( assert ) {
assert.expect( 11 ); assert.expect( 11 );
var $elem, var $elem,
$elems = jQuery( [ { a:0 },{ a:0 } ] ), $elems = jQuery( [ { a:0 }, { a:0 } ] ),
counter = 0; counter = 0;
assert.equal( jQuery.timers.length, 0, "Make sure no animation was running from another test" ); assert.equal( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
@ -1845,7 +1845,7 @@ QUnit.test( "non-px animation handles non-numeric start (#11971)", function( ass
this.clock.tick( 10 ); this.clock.tick( 10 );
} ); } );
QUnit.test("Animation callbacks (#11797)", function( assert ) { QUnit.test( "Animation callbacks (#11797)", function( assert ) {
assert.expect( 16 ); assert.expect( 16 );
var prog = 0, var prog = 0,
@ -1966,7 +1966,7 @@ QUnit.test( "Animation callbacks in order (#2292)", function( assert ) {
always: function() { always: function() {
assert.step( 5 ); assert.step( 5 );
} }
}).finish(); } ).finish();
this.clock.tick( dur + 10 ); this.clock.tick( dur + 10 );
} ); } );

View File

@ -21,10 +21,10 @@ QUnit.test( "null or undefined handler", function( assert ) {
var expectedElem = jQuery( "#firstp" ); var expectedElem = jQuery( "#firstp" );
var actualElem = expectedElem.on( "click", null ); var actualElem = expectedElem.on( "click", null );
assert.equal(actualElem, expectedElem, "Passing a null handler should return the original element"); assert.equal( actualElem, expectedElem, "Passing a null handler should return the original element" );
actualElem = expectedElem.on( "click", undefined ); actualElem = expectedElem.on( "click", undefined );
assert.equal(actualElem, expectedElem, "Passing a null handler should return the original element"); assert.equal( actualElem, expectedElem, "Passing a null handler should return the original element" );
} ); } );
QUnit.test( "on() with non-null,defined data", function( assert ) { QUnit.test( "on() with non-null,defined data", function( assert ) {
@ -78,7 +78,7 @@ QUnit.test( "on(), with data", function( assert ) {
handler = function( event ) { handler = function( event ) {
assert.ok( event.data, "on() with data, check passed data exists" ); assert.ok( event.data, "on() with data, check passed data exists" );
assert.equal( event.data[ "foo" ], "bar", "on() with data, Check value of passed data" ); assert.equal( event.data.foo, "bar", "on() with data, Check value of passed data" );
}; };
jQuery( "#firstp" ).on( "click", { "foo": "bar" }, handler ).trigger( "click" ).off( "click", handler ); jQuery( "#firstp" ).on( "click", { "foo": "bar" }, handler ).trigger( "click" ).off( "click", handler );
@ -95,7 +95,7 @@ QUnit.test( "click(), with data", function( assert ) {
assert.expect( 3 ); assert.expect( 3 );
var handler = function( event ) { var handler = function( event ) {
assert.ok( event.data, "on() with data, check passed data exists" ); assert.ok( event.data, "on() with data, check passed data exists" );
assert.equal( event.data[ "foo" ], "bar", "on() with data, Check value of passed data" ); assert.equal( event.data.foo, "bar", "on() with data, Check value of passed data" );
}; };
jQuery( "#firstp" ).on( "click", { "foo": "bar" }, handler ).trigger( "click" ).off( "click", handler ); jQuery( "#firstp" ).on( "click", { "foo": "bar" }, handler ).trigger( "click" ).off( "click", handler );
@ -199,7 +199,7 @@ QUnit.test( "on(), namespace with special add", function( assert ) {
assert.ok( true, "Test event fired." ); assert.ok( true, "Test event fired." );
} ); } );
jQuery.event.special[ "test" ] = { jQuery.event.special.test = {
_default: function( e, data ) { _default: function( e, data ) {
assert.equal( e.type, "test", "Make sure we're dealing with a test event." ); assert.equal( e.type, "test", "Make sure we're dealing with a test event." );
assert.ok( data, "And that trigger data was passed." ); assert.ok( data, "And that trigger data was passed." );
@ -251,7 +251,7 @@ QUnit.test( "on(), namespace with special add", function( assert ) {
// Should trigger 2 // Should trigger 2
div.appendTo( "#qunit-fixture" ).remove(); div.appendTo( "#qunit-fixture" ).remove();
delete jQuery.event.special[ "test" ]; delete jQuery.event.special.test;
} ); } );
QUnit.test( "on(), no data", function( assert ) { QUnit.test( "on(), no data", function( assert ) {
@ -726,8 +726,8 @@ QUnit.test( "on()/trigger()/off() on plain object", function( assert ) {
events = jQuery._data( obj, "events" ); events = jQuery._data( obj, "events" );
assert.ok( events, "Object has events bound." ); assert.ok( events, "Object has events bound." );
assert.equal( obj[ "events" ], undefined, "Events object on plain objects is not events" ); assert.equal( obj[ "events" ], undefined, "Events object on plain objects is not events" );
assert.equal( obj[ "test" ], undefined, "Make sure that test event is not on the plain object." ); assert.equal( obj.test, undefined, "Make sure that test event is not on the plain object." );
assert.equal( obj[ "handle" ], undefined, "Make sure that the event handler is not on the plain object." ); assert.equal( obj.handle, undefined, "Make sure that the event handler is not on the plain object." );
// Should trigger 1 // Should trigger 1
jQuery( obj ).trigger( "test" ); jQuery( obj ).trigger( "test" );
@ -1192,7 +1192,7 @@ QUnit.test( "trigger(eventObject, [data], [fn])", function( assert ) {
//$child.on("foo", error ); //$child.on("foo", error );
event = new jQuery.Event( "foo" ); event = new jQuery.Event( "foo" );
$child.trigger( event, [ 1,2,3 ] ).off(); $child.trigger( event, [ 1, 2, 3 ] ).off();
assert.equal( event.result, "result", "Check event.result attribute" ); assert.equal( event.result, "result", "Check event.result attribute" );
// Will error if it bubbles // Will error if it bubbles
@ -1601,7 +1601,7 @@ QUnit.test( ".on()/.off()", function( assert ) {
// Test binding with different this object // Test binding with different this object
jQuery( "#body" ).on( "click", "#foo", jQuery.proxy( function() { jQuery( "#body" ).on( "click", "#foo", jQuery.proxy( function() {
assert.equal( this[ "foo" ], "bar", "on with event scope" ); }, { "foo": "bar" } assert.equal( this.foo, "bar", "on with event scope" ); }, { "foo": "bar" }
) ); ) );
jQuery( "#foo" ).trigger( "click" ); jQuery( "#foo" ).trigger( "click" );
jQuery( "#body" ).off( "click", "#foo" ); jQuery( "#body" ).off( "click", "#foo" );
@ -1860,7 +1860,7 @@ QUnit.test( "ignore comment nodes in event delegation (gh-2055)", function( asse
.appendTo( $foo.find( "#sap" ) ); .appendTo( $foo.find( "#sap" ) );
if ( !test() ) { if ( !test() ) {
fireNative( $comment[0], "DOMNodeInserted" ); fireNative( $comment[ 0 ], "DOMNodeInserted" );
} }
} ); } );
@ -2234,7 +2234,7 @@ QUnit.test( ".on and .off", function( assert ) {
QUnit.test( "special on name mapping", function( assert ) { QUnit.test( "special on name mapping", function( assert ) {
assert.expect( 7 ); assert.expect( 7 );
jQuery.event.special[ "slap" ] = { jQuery.event.special.slap = {
bindType: "click", bindType: "click",
delegateType: "swing", delegateType: "swing",
handle: function( event ) { handle: function( event ) {
@ -2265,9 +2265,9 @@ QUnit.test( "special on name mapping", function( assert ) {
.trigger( "swing" ) .trigger( "swing" )
.end() .end()
.remove(); .remove();
delete jQuery.event.special[ "slap" ]; delete jQuery.event.special.slap;
jQuery.event.special[ "gutfeeling" ] = { jQuery.event.special.gutfeeling = {
bindType: "click", bindType: "click",
delegateType: "click", delegateType: "click",
handle: function( event ) { handle: function( event ) {
@ -2356,9 +2356,9 @@ QUnit.test( "clone() delegated events (#11076)", function( assert ) {
clone = table.clone( true ); clone = table.clone( true );
clone.find( "td" ).trigger( "click" ); clone.find( "td" ).trigger( "click" );
assert.equal( counter[ "center" ], 1, "first child" ); assert.equal( counter.center, 1, "first child" );
assert.equal( counter[ "fold" ], 1, "last child" ); assert.equal( counter.fold, 1, "last child" );
assert.equal( counter[ "centerfold" ], 2, "all children" ); assert.equal( counter.centerfold, 2, "all children" );
table.remove(); table.remove();
clone.remove(); clone.remove();
@ -2576,7 +2576,7 @@ QUnit.test( "change handler should be detached from element", function( assert )
originRemoveEvent( elem, type, handle ); originRemoveEvent( elem, type, handle );
}; };
jQuery.removeEvent = wrapperRemoveEvent ; jQuery.removeEvent = wrapperRemoveEvent;
$fixture.on( "change", function() {} ); $fixture.on( "change", function() {} );
$fixture.off( "change" ); $fixture.off( "change" );
@ -2902,6 +2902,7 @@ QUnit.test( "originalEvent property for Chrome, Safari, Fx & Edge of simulated e
"make sure originalEvent type is correct" ); "make sure originalEvent type is correct" );
assert.equal( event.type, "focusin", "make sure type is correct" ); assert.equal( event.type, "focusin", "make sure type is correct" );
} ); } );
jQuery( "#donor-input" ).on( "focus", function() { jQuery( "#donor-input" ).on( "focus", function() {
assert.ok( true, "got a focus event from the input" ); assert.ok( true, "got a focus event from the input" );
done(); done();

View File

@ -609,7 +609,7 @@ QUnit.test( "append(xml)", function( assert ) {
// IE // IE
for ( n = 0, len = aActiveX.length; n < len; n++ ) { for ( n = 0, len = aActiveX.length; n < len; n++ ) {
try { try {
elem = new ActiveXObject( aActiveX[ n ] ); elem = new window.ActiveXObject( aActiveX[ n ] );
return elem; return elem;
} catch ( _ ) {} } catch ( _ ) {}
} }
@ -1175,7 +1175,7 @@ QUnit.test( ".after(disconnected node)", function( assert ) {
QUnit.test( "insertAfter(String)", function( assert ) { QUnit.test( "insertAfter(String)", function( assert ) {
assert.expect( 1 ) ; assert.expect( 1 );
var expected = "This is a normal link: Yahoobuga"; var expected = "This is a normal link: Yahoobuga";
jQuery( "<b>buga</b>" ).insertAfter( "#yahoo" ); jQuery( "<b>buga</b>" ).insertAfter( "#yahoo" );
@ -1211,7 +1211,7 @@ QUnit.test( "insertAfter(jQuery)", function( assert ) {
function testReplaceWith( val, assert ) { function testReplaceWith( val, assert ) {
var tmp, y, child, child2, set, non_existent, $div, var tmp, y, child, child2, set, nonExistent, $div,
expected = 29; expected = 29;
assert.expect( expected ); assert.expect( expected );
@ -1295,8 +1295,8 @@ function testReplaceWith( val, assert ) {
assert.deepEqual( jQuery( ".pathological", "#qunit-fixture" ).get(), [], assert.deepEqual( jQuery( ".pathological", "#qunit-fixture" ).get(), [],
"Replacement with following sibling (context removed)" ); "Replacement with following sibling (context removed)" );
non_existent = jQuery( "#does-not-exist" ).replaceWith( val( "<b>should not throw an error</b>" ) ); nonExistent = jQuery( "#does-not-exist" ).replaceWith( val( "<b>should not throw an error</b>" ) );
assert.equal( non_existent.length, 0, "Length of non existent element." ); assert.equal( nonExistent.length, 0, "Length of non existent element." );
$div = jQuery( "<div class='replacewith'></div>" ).appendTo( "#qunit-fixture" ); $div = jQuery( "<div class='replacewith'></div>" ).appendTo( "#qunit-fixture" );
$div.replaceWith( val( "<div class='replacewith'></div><script>" + $div.replaceWith( val( "<div class='replacewith'></div><script>" +
@ -1623,7 +1623,7 @@ QUnit.test( "clone(multiple selected options) (Bug #8129)", function( assert ) {
var element = jQuery( "<select><option>Foo</option><option selected>Bar</option><option selected>Baz</option></select>" ); var element = jQuery( "<select><option>Foo</option><option selected>Bar</option><option selected>Baz</option></select>" );
function getSelectedOptions( collection ) { function getSelectedOptions( collection ) {
return collection.find( "option" ).filter(function( option ) { return collection.find( "option" ).filter( function( option ) {
return option.selected; return option.selected;
} ); } );
} }
@ -2464,7 +2464,7 @@ QUnit.test( "script evaluation (#11795)", function( assert ) {
if ( jQuery.ajax ) { if ( jQuery.ajax ) {
Globals.register( "testBar" ); Globals.register( "testBar" );
jQuery( "#qunit-fixture" ).append( "<script src='" + url( "data/testbar.php" ) + "'/>" ); jQuery( "#qunit-fixture" ).append( "<script src='" + url( "data/testbar.php" ) + "'/>" );
assert.strictEqual( window[ "testBar" ], "bar", "Global script evaluation" ); assert.strictEqual( window.testBar, "bar", "Global script evaluation" );
} else { } else {
assert.ok( true, "No jQuery.ajax" ); assert.ok( true, "No jQuery.ajax" );
assert.ok( true, "No jQuery.ajax" ); assert.ok( true, "No jQuery.ajax" );
@ -2745,8 +2745,8 @@ QUnit.test( "Insert script with data-URI (gh-1887)", 1, function( assert ) {
jQuery( fixture ).append( "<script src=\"data:text/javascript,testFoo = 'foo';\"></script>" ); jQuery( fixture ).append( "<script src=\"data:text/javascript,testFoo = 'foo';\"></script>" );
setTimeout( function() { setTimeout( function() {
if ( window[ "testSrcFoo" ] === "foo" ) { if ( window.testSrcFoo === "foo" ) {
assert.strictEqual( window[ "testFoo" ], window[ "testSrcFoo" ], "data-URI script executed" ); assert.strictEqual( window.testFoo, window.testSrcFoo, "data-URI script executed" );
} else { } else {
assert.ok( true, "data-URI script is not supported by this environment" ); assert.ok( true, "data-URI script is not supported by this environment" );

View File

@ -79,8 +79,8 @@ testIframe( "absolute", "offset/absolute.html", function( assert, $, iframe ) {
{ "id": "#absolute-1", "top": 1, "left": 1 } { "id": "#absolute-1", "top": 1, "left": 1 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( jQuery( this[ "id" ], doc ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset().top" ); assert.equal( jQuery( this.id, doc ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" );
assert.equal( jQuery( this[ "id" ], doc ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset().left" ); assert.equal( jQuery( this.id, doc ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
} ); } );
// get position // get position
@ -88,8 +88,8 @@ testIframe( "absolute", "offset/absolute.html", function( assert, $, iframe ) {
{ "id": "#absolute-1", "top": 0, "left": 0 } { "id": "#absolute-1", "top": 0, "left": 0 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( jQuery( this[ "id" ], doc ).position().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').position().top" ); assert.equal( jQuery( this.id, doc ).position().top, this.top, "jQuery('" + this.id + "').position().top" );
assert.equal( jQuery( this[ "id" ], doc ).position().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').position().left" ); assert.equal( jQuery( this.id, doc ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
} ); } );
} ); } );
@ -106,8 +106,8 @@ testIframe( "absolute", "offset/absolute.html", function( assert, $ ) {
{ "id": "#absolute-2", "top": 20, "left": 20 } { "id": "#absolute-2", "top": 20, "left": 20 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset().top" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset().left" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
} ); } );
// get position // get position
@ -118,8 +118,8 @@ testIframe( "absolute", "offset/absolute.html", function( assert, $ ) {
{ "id": "#absolute-2", "top": 19, "left": 19 } { "id": "#absolute-2", "top": 19, "left": 19 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( $( this[ "id" ] ).position().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').position().top" ); assert.equal( $( this.id ).position().top, this.top, "jQuery('" + this.id + "').position().top" );
assert.equal( $( this[ "id" ] ).position().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').position().left" ); assert.equal( $( this.id ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
} ); } );
// test #5781 // test #5781
@ -147,34 +147,34 @@ testIframe( "absolute", "offset/absolute.html", function( assert, $ ) {
{ "id": "#absolute-1", "top": 1, "left": 1 } { "id": "#absolute-1", "top": 1, "left": 1 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ] } ); $( this.id ).offset( { "top": this.top, "left": this.left } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset({ top: " + this[ "top" ] + " })" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset({ left: " + this[ "left" ] + " })" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
var top = this[ "top" ], left = this[ "left" ]; var top = this.top, left = this.left;
$( this[ "id" ] ).offset( function( i, val ) { $( this.id ).offset( function( i, val ) {
assert.equal( val.top, top, "Verify incoming top position." ); assert.equal( val.top, top, "Verify incoming top position." );
assert.equal( val.left, left, "Verify incoming top position." ); assert.equal( val.left, left, "Verify incoming top position." );
return { "top": top + 1, "left": left + 1 }; return { "top": top + 1, "left": left + 1 };
} ); } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ top: " + ( this[ "top" ] + 1 ) + " })" ); assert.equal( $( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + ( this.top + 1 ) + " })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ left: " + ( this[ "left" ] + 1 ) + " })" ); assert.equal( $( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + ( this.left + 1 ) + " })" );
$( this[ "id" ] ) $( this.id )
.offset( { "left": this[ "left" ] + 2 } ) .offset( { "left": this.left + 2 } )
.offset( { "top": this[ "top" ] + 2 } ); .offset( { "top": this.top + 2 } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ] + 2, "Setting one property at a time." ); assert.equal( $( this.id ).offset().top, this.top + 2, "Setting one property at a time." );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ] + 2, "Setting one property at a time." ); assert.equal( $( this.id ).offset().left, this.left + 2, "Setting one property at a time." );
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ], "using": function( props ) { $( this.id ).offset( { "top": this.top, "left": this.left, "using": function( props ) {
$( this ).css( { $( this ).css( {
"top": props.top + 1, "top": props.top + 1,
"left": props.left + 1 "left": props.left + 1
} ); } );
} } ); } } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ top: " + ( this[ "top" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + ( this.top + 1 ) + ", using: fn })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ left: " + ( this[ "left" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + ( this.left + 1 ) + ", using: fn })" );
} ); } );
} ); } );
@ -189,8 +189,8 @@ testIframe( "relative", "offset/relative.html", function( assert, $ ) {
{ "id": "#relative-2-1", "top": 149, "left": 52 } { "id": "#relative-2-1", "top": 149, "left": 52 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset().top" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset().left" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
} ); } );
// get position // get position
@ -201,8 +201,8 @@ testIframe( "relative", "offset/relative.html", function( assert, $ ) {
{ "id": "#relative-2-1", "top": 5, "left": 5 } { "id": "#relative-2-1", "top": 5, "left": 5 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( $( this[ "id" ] ).position().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').position().top" ); assert.equal( $( this.id ).position().top, this.top, "jQuery('" + this.id + "').position().top" );
assert.equal( $( this[ "id" ] ).position().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').position().left" ); assert.equal( $( this.id ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
} ); } );
// set offset // set offset
@ -221,18 +221,18 @@ testIframe( "relative", "offset/relative.html", function( assert, $ ) {
{ "id": "#relative-1", "top": 7, "left": 7 } { "id": "#relative-1", "top": 7, "left": 7 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ] } ); $( this.id ).offset( { "top": this.top, "left": this.left } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset({ top: " + this[ "top" ] + " })" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset({ left: " + this[ "left" ] + " })" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ], "using": function( props ) { $( this.id ).offset( { "top": this.top, "left": this.left, "using": function( props ) {
$( this ).css( { $( this ).css( {
"top": props.top + 1, "top": props.top + 1,
"left": props.left + 1 "left": props.left + 1
} ); } );
} } ); } } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ top: " + ( this[ "top" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + ( this.top + 1 ) + ", using: fn })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ left: " + ( this[ "left" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + ( this.left + 1 ) + ", using: fn })" );
} ); } );
} ); } );
@ -247,8 +247,8 @@ testIframe( "static", "offset/static.html", function( assert, $ ) {
{ "id": "#static-2", "top": 122, left: 7 } { "id": "#static-2", "top": 122, left: 7 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset().top" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset().left" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
} ); } );
// get position // get position
@ -259,8 +259,8 @@ testIframe( "static", "offset/static.html", function( assert, $ ) {
{ "id": "#static-2", "top": 121, "left": 6 } { "id": "#static-2", "top": 121, "left": 6 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
assert.equal( $( this[ "id" ] ).position().top, this[ "top" ], "jQuery('" + this[ "top" ] + "').position().top" ); assert.equal( $( this.id ).position().top, this.top, "jQuery('" + this.top + "').position().top" );
assert.equal( $( this[ "id" ] ).position().left, this[ "left" ], "jQuery('" + this[ "left" ] + "').position().left" ); assert.equal( $( this.id ).position().left, this.left, "jQuery('" + this.left + "').position().left" );
} ); } );
// set offset // set offset
@ -283,18 +283,18 @@ testIframe( "static", "offset/static.html", function( assert, $ ) {
{ "id": "#static-1", "top": 7, "left": 7 } { "id": "#static-1", "top": 7, "left": 7 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ] } ); $( this.id ).offset( { "top": this.top, "left": this.left } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset({ top: " + this[ "top" ] + " })" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset({ left: " + this[ "left" ] + " })" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ], "using": function( props ) { $( this.id ).offset( { "top": this.top, "left": this.left, "using": function( props ) {
$( this ).css( { $( this ).css( {
"top": props.top + 1, "top": props.top + 1,
"left": props.left + 1 "left": props.left + 1
} ); } );
} } ); } } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ top: " + ( this[ "top" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + ( this.top + 1 ) + ", using: fn })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ left: " + ( this[ "left" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + ( this.left + 1 ) + ", using: fn })" );
} ); } );
} ); } );
@ -328,10 +328,10 @@ testIframe( "fixed", "offset/fixed.html", function( assert, $, window ) {
assert.ok( true, "Browser doesn't support scroll position." ); assert.ok( true, "Browser doesn't support scroll position." );
} else if ( window.supportsFixedPosition ) { } else if ( window.supportsFixedPosition ) {
assert.equal( $( this[ "id" ] ).offset().top, this[ "offsetTop" ], "jQuery('" + this[ "id" ] + "').offset().top" ); assert.equal( $( this.id ).offset().top, this.offsetTop, "jQuery('" + this.id + "').offset().top" );
assert.equal( $( this[ "id" ] ).position().top, this[ "positionTop" ], "jQuery('" + this[ "id" ] + "').position().top" ); assert.equal( $( this.id ).position().top, this.positionTop, "jQuery('" + this.id + "').position().top" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "offsetLeft" ], "jQuery('" + this[ "id" ] + "').offset().left" ); assert.equal( $( this.id ).offset().left, this.offsetLeft, "jQuery('" + this.id + "').offset().left" );
assert.equal( $( this[ "id" ] ).position().left, this[ "positionLeft" ], "jQuery('" + this[ "id" ] + "').position().left" ); assert.equal( $( this.id ).position().left, this.positionLeft, "jQuery('" + this.id + "').position().left" );
} else { } else {
// need to have same number of assertions // need to have same number of assertions
@ -353,18 +353,18 @@ testIframe( "fixed", "offset/fixed.html", function( assert, $, window ) {
jQuery.each( tests, function() { jQuery.each( tests, function() {
if ( window.supportsFixedPosition ) { if ( window.supportsFixedPosition ) {
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ] } ); $( this.id ).offset( { "top": this.top, "left": this.left } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ], "jQuery('" + this[ "id" ] + "').offset({ top: " + this[ "top" ] + " })" ); assert.equal( $( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ], "jQuery('" + this[ "id" ] + "').offset({ left: " + this[ "left" ] + " })" ); assert.equal( $( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
$( this[ "id" ] ).offset( { "top": this[ "top" ], "left": this[ "left" ], "using": function( props ) { $( this.id ).offset( { "top": this.top, "left": this.left, "using": function( props ) {
$( this ).css( { $( this ).css( {
"top": props.top + 1, "top": props.top + 1,
"left": props.left + 1 "left": props.left + 1
} ); } );
} } ); } } );
assert.equal( $( this[ "id" ] ).offset().top, this[ "top" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ top: " + ( this[ "top" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + ( this.top + 1 ) + ", using: fn })" );
assert.equal( $( this[ "id" ] ).offset().left, this[ "left" ] + 1, "jQuery('" + this[ "id" ] + "').offset({ left: " + ( this[ "left" ] + 1 ) + ", using: fn })" ); assert.equal( $( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + ( this.left + 1 ) + ", using: fn })" );
} else { } else {
// need to have same number of assertions // need to have same number of assertions
@ -549,8 +549,10 @@ QUnit.test( "iframe scrollTop/Left (see gh-1945)", function( assert ) {
// Mobile Safari resize the iframe by its content meaning it's not possible to scroll // Mobile Safari resize the iframe by its content meaning it's not possible to scroll
// the iframe but only its parent element. // the iframe but only its parent element.
// It seems (not confirmed) in android 4.0 it's not possible to scroll iframes from the code. // It seems (not confirmed) in android 4.0 it's not possible to scroll iframes from the code.
if ( /iphone os/i.test( navigator.userAgent ) || if (
/android 4\.0/i.test( navigator.userAgent ) ) { /iphone os/i.test( navigator.userAgent ) ||
/android 4\.0/i.test( navigator.userAgent )
) {
assert.equal( true, true, "Can't scroll iframes in this environment" ); assert.equal( true, true, "Can't scroll iframes in this environment" );
assert.equal( true, true, "Can't scroll iframes in this environment" ); assert.equal( true, true, "Can't scroll iframes in this environment" );

View File

@ -32,7 +32,7 @@ QUnit.test( "id", function( assert ) {
assert.t( "ID selector with existing ID descendant", "#firstp #simon1", [ "simon1" ] ); assert.t( "ID selector with existing ID descendant", "#firstp #simon1", [ "simon1" ] );
assert.t( "ID selector with non-existent descendant", "#firstp #foobar", [] ); assert.t( "ID selector with non-existent descendant", "#firstp #foobar", [] );
assert.t( "ID selector using UTF8", "#台北Táiběi", [ "台北Táiběi" ] ); assert.t( "ID selector using UTF8", "#台北Táiběi", [ "台北Táiběi" ] );
assert.t( "Multiple ID selectors using UTF8", "#台北Táiběi, #台北", [ "台北Táiběi","台北" ] ); assert.t( "Multiple ID selectors using UTF8", "#台北Táiběi, #台北", [ "台北Táiběi", "台北" ] );
assert.t( "Descendant ID selector using UTF8", "div #台北", [ "台北" ] ); assert.t( "Descendant ID selector using UTF8", "div #台北", [ "台北" ] );
assert.t( "Child ID selector using UTF8", "form > #台北", [ "台北" ] ); assert.t( "Child ID selector using UTF8", "form > #台北", [ "台北" ] );
@ -103,14 +103,14 @@ QUnit.test( "selectors with comma", function( assert ) {
QUnit.test( "child and adjacent", function( assert ) { QUnit.test( "child and adjacent", function( assert ) {
assert.expect( 27 ); assert.expect( 27 );
assert.t( "Child", "p > a", [ "simon1","google","groups","mark","yahoo","simon" ] ); assert.t( "Child", "p > a", [ "simon1", "google", "groups", "mark", "yahoo", "simon" ] );
assert.t( "Child", "p> a", [ "simon1","google","groups","mark","yahoo","simon" ] ); assert.t( "Child", "p> a", [ "simon1", "google", "groups", "mark", "yahoo", "simon" ] );
assert.t( "Child", "p >a", [ "simon1","google","groups","mark","yahoo","simon" ] ); assert.t( "Child", "p >a", [ "simon1", "google", "groups", "mark", "yahoo", "simon" ] );
assert.t( "Child", "p>a", [ "simon1","google","groups","mark","yahoo","simon" ] ); assert.t( "Child", "p>a", [ "simon1", "google", "groups", "mark", "yahoo", "simon" ] );
assert.t( "Child w/ Class", "p > a.blog", [ "mark","simon" ] ); assert.t( "Child w/ Class", "p > a.blog", [ "mark", "simon" ] );
assert.t( "All Children", "code > *", [ "anchor1","anchor2" ] ); assert.t( "All Children", "code > *", [ "anchor1", "anchor2" ] );
assert.selectInFixture( "All Grandchildren", "p > * > *", [ "anchor1","anchor2" ] ); assert.selectInFixture( "All Grandchildren", "p > * > *", [ "anchor1", "anchor2" ] );
assert.t( "Adjacent", "p + p", [ "ap","en","sap" ] ); assert.t( "Adjacent", "p + p", [ "ap", "en", "sap" ] );
assert.t( "Adjacent", "p#firstp + p", [ "ap" ] ); assert.t( "Adjacent", "p#firstp + p", [ "ap" ] );
assert.t( "Adjacent", "p[lang=en] + p", [ "sap" ] ); assert.t( "Adjacent", "p[lang=en] + p", [ "sap" ] );
assert.t( "Adjacent", "a.GROUPS + code + a", [ "mark" ] ); assert.t( "Adjacent", "a.GROUPS + code + a", [ "mark" ] );
@ -163,7 +163,7 @@ QUnit.test( "attributes", function( assert ) {
assert.t( "Attribute Equals", "#qunit-fixture a[rel=bookmark]", [ "simon1" ] ); assert.t( "Attribute Equals", "#qunit-fixture a[rel=bookmark]", [ "simon1" ] );
assert.t( "Attribute Equals", "#qunit-fixture a[href='http://www.google.com/']", [ "google" ] ); assert.t( "Attribute Equals", "#qunit-fixture a[href='http://www.google.com/']", [ "google" ] );
assert.t( "Attribute Equals", "#qunit-fixture a[ rel = 'bookmark' ]", [ "simon1" ] ); assert.t( "Attribute Equals", "#qunit-fixture a[ rel = 'bookmark' ]", [ "simon1" ] );
assert.t( "Attribute Equals Number", "#qunit-fixture option[value='1']", [ "option1b","option2b","option3b","option4b","option5c" ] ); assert.t( "Attribute Equals Number", "#qunit-fixture option[value='1']", [ "option1b", "option2b", "option3b", "option4b", "option5c" ] );
assert.t( "Attribute Equals Number", "#qunit-fixture li[tabIndex='-1']", [ "foodWithNegativeTabIndex" ] ); assert.t( "Attribute Equals Number", "#qunit-fixture li[tabIndex='-1']", [ "foodWithNegativeTabIndex" ] );
document.getElementById( "anchor2" ).href = "#2"; document.getElementById( "anchor2" ).href = "#2";
@ -187,13 +187,13 @@ QUnit.test( "attributes", function( assert ) {
assert.t( "Attribute selector using UTF8", "span[lang=中文]", [ "台北" ] ); assert.t( "Attribute selector using UTF8", "span[lang=中文]", [ "台北" ] );
assert.t( "Attribute Begins With", "a[href ^= 'http://www']", [ "google","yahoo" ] ); assert.t( "Attribute Begins With", "a[href ^= 'http://www']", [ "google", "yahoo" ] );
assert.t( "Attribute Ends With", "a[href $= 'org/']", [ "mark" ] ); assert.t( "Attribute Ends With", "a[href $= 'org/']", [ "mark" ] );
assert.t( "Attribute Contains", "a[href *= 'google']", [ "google","groups" ] ); assert.t( "Attribute Contains", "a[href *= 'google']", [ "google", "groups" ] );
if ( jQuery.find.compile ) { if ( jQuery.find.compile ) {
assert.t( "Empty values", "#select1 option[value!='']", [ "option1b","option1c","option1d" ] ); assert.t( "Empty values", "#select1 option[value!='']", [ "option1b", "option1c", "option1d" ] );
assert.t( "Attribute Is Not Equal", "#ap a[hreflang!='en']", [ "google","groups","anchor1" ] ); assert.t( "Attribute Is Not Equal", "#ap a[hreflang!='en']", [ "google", "groups", "anchor1" ] );
assert.t( "Select options via :selected", "#select1 option:selected", [ "option1a" ] ); assert.t( "Select options via :selected", "#select1 option:selected", [ "option1a" ] );
assert.t( "Select options via :selected", "#select2 option:selected", [ "option2d" ] ); assert.t( "Select options via :selected", "#select2 option:selected", [ "option2d" ] );
assert.t( "Select options via :selected", "#select3 option:selected", [ "option3b", "option3c" ] ); assert.t( "Select options via :selected", "#select3 option:selected", [ "option3b", "option3c" ] );
@ -493,7 +493,7 @@ testIframe(
"Sizzle cache collides with multiple Sizzles on a page", "Sizzle cache collides with multiple Sizzles on a page",
"selector/sizzle_cache.html", "selector/sizzle_cache.html",
function( assert, jQuery, window, document ) { function( assert, jQuery, window, document ) {
var $cached = window[ "$cached" ]; var $cached = window.$cached;
assert.expect( 4 ); assert.expect( 4 );
assert.notStrictEqual( jQuery, $cached, "Loaded two engines" ); assert.notStrictEqual( jQuery, $cached, "Loaded two engines" );

View File

@ -8,7 +8,7 @@ QUnit.test( "jQuery.param()", function( assert ) {
params = { "foo":"bar", "baz":42, "quux":"All your base are belong to us" }; params = { "foo":"bar", "baz":42, "quux":"All your base are belong to us" };
assert.equal( jQuery.param( params ), "foo=bar&baz=42&quux=All%20your%20base%20are%20belong%20to%20us", "simple" ); assert.equal( jQuery.param( params ), "foo=bar&baz=42&quux=All%20your%20base%20are%20belong%20to%20us", "simple" );
params = { "string":"foo","null":null,"undefined":undefined }; params = { "string":"foo", "null":null, "undefined":undefined };
assert.equal( jQuery.param( params ), "string=foo&null=&undefined=", "handle nulls and undefineds properly" ); assert.equal( jQuery.param( params ), "string=foo&null=&undefined=", "handle nulls and undefineds properly" );
params = { "someName": [ 1, 2, 3 ], "regularThing": "blah" }; params = { "someName": [ 1, 2, 3 ], "regularThing": "blah" };
@ -23,16 +23,16 @@ QUnit.test( "jQuery.param()", function( assert ) {
params = { "foo": { "bar": "baz", "beep": 42, "quux": "All your base are belong to us" } }; params = { "foo": { "bar": "baz", "beep": 42, "quux": "All your base are belong to us" } };
assert.equal( jQuery.param( params ), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" ); assert.equal( jQuery.param( params ), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
params = { a:[ 1,2 ], b:{ c:3, d:[ 4,5 ], e:{ x:[ 6 ], y:7, z:[ 8,9 ] }, f:true, g:false, h:undefined }, i:[ 10,11 ], j:true, k:false, l:[ undefined,0 ], m:"cowboy hat?" }; params = { a:[ 1, 2 ], b:{ c:3, d:[ 4, 5 ], e:{ x:[ 6 ], y:7, z:[ 8, 9 ] }, f:true, g:false, h:undefined }, i:[ 10, 11 ], j:true, k:false, l:[ undefined, 0 ], m:"cowboy hat?" };
assert.equal( decodeURIComponent( jQuery.param( params ) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=&i[]=10&i[]=11&j=true&k=false&l[]=&l[]=0&m=cowboy hat?", "huge structure" ); assert.equal( decodeURIComponent( jQuery.param( params ) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=&i[]=10&i[]=11&j=true&k=false&l[]=&l[]=0&m=cowboy hat?", "huge structure" );
params = { "a": [ 0, [ 1, 2 ], [ 3, [ 4, 5 ], [ 6 ] ], { "b": [ 7, [ 8, 9 ], [ { "c": 10, "d": 11 } ], [ [ 12 ] ], [ [ [ 13 ] ] ], { "e": { "f": { "g": [ 14, [ 15 ] ] } } }, 16 ] }, 17 ] }; params = { "a": [ 0, [ 1, 2 ], [ 3, [ 4, 5 ], [ 6 ] ], { "b": [ 7, [ 8, 9 ], [ { "c": 10, "d": 11 } ], [ [ 12 ] ], [ [ [ 13 ] ] ], { "e": { "f": { "g": [ 14, [ 15 ] ] } } }, 16 ] }, 17 ] };
assert.equal( decodeURIComponent( jQuery.param( params ) ), "a[]=0&a[1][]=1&a[1][]=2&a[2][]=3&a[2][1][]=4&a[2][1][]=5&a[2][2][]=6&a[3][b][]=7&a[3][b][1][]=8&a[3][b][1][]=9&a[3][b][2][0][c]=10&a[3][b][2][0][d]=11&a[3][b][3][0][]=12&a[3][b][4][0][0][]=13&a[3][b][5][e][f][g][]=14&a[3][b][5][e][f][g][1][]=15&a[3][b][]=16&a[]=17", "nested arrays" ); assert.equal( decodeURIComponent( jQuery.param( params ) ), "a[]=0&a[1][]=1&a[1][]=2&a[2][]=3&a[2][1][]=4&a[2][1][]=5&a[2][2][]=6&a[3][b][]=7&a[3][b][1][]=8&a[3][b][1][]=9&a[3][b][2][0][c]=10&a[3][b][2][0][d]=11&a[3][b][3][0][]=12&a[3][b][4][0][0][]=13&a[3][b][5][e][f][g][]=14&a[3][b][5][e][f][g][1][]=15&a[3][b][]=16&a[]=17", "nested arrays" );
params = { "a":[ 1,2 ], "b":{ "c":3, "d":[ 4,5 ], "e":{ "x":[ 6 ], "y":7, "z":[ 8,9 ] }, "f":true, "g":false, "h":undefined }, "i":[ 10,11 ], "j":true, "k":false, "l":[ undefined,0 ], "m":"cowboy hat?" }; params = { "a":[ 1, 2 ], "b":{ "c":3, "d":[ 4, 5 ], "e":{ "x":[ 6 ], "y":7, "z":[ 8, 9 ] }, "f":true, "g":false, "h":undefined }, "i":[ 10, 11 ], "j":true, "k":false, "l":[ undefined, 0 ], "m":"cowboy hat?" };
assert.equal( jQuery.param( params, true ), "a=1&a=2&b=%5Bobject%20Object%5D&i=10&i=11&j=true&k=false&l=&l=0&m=cowboy%20hat%3F", "huge structure, forced traditional" ); assert.equal( jQuery.param( params, true ), "a=1&a=2&b=%5Bobject%20Object%5D&i=10&i=11&j=true&k=false&l=&l=0&m=cowboy%20hat%3F", "huge structure, forced traditional" );
assert.equal( decodeURIComponent( jQuery.param( { "a": [ 1,2,3 ], "b[]": [ 4,5,6 ], "c[d]": [ 7,8,9 ], "e": { "f": [ 10 ], "g": [ 11,12 ], "h": 13 } } ) ), "a[]=1&a[]=2&a[]=3&b[]=4&b[]=5&b[]=6&c[d][]=7&c[d][]=8&c[d][]=9&e[f][]=10&e[g][]=11&e[g][]=12&e[h]=13", "Make sure params are not double-encoded." ); assert.equal( decodeURIComponent( jQuery.param( { "a": [ 1, 2, 3 ], "b[]": [ 4, 5, 6 ], "c[d]": [ 7, 8, 9 ], "e": { "f": [ 10 ], "g": [ 11, 12 ], "h": 13 } } ) ), "a[]=1&a[]=2&a[]=3&b[]=4&b[]=5&b[]=6&c[d][]=7&c[d][]=8&c[d][]=9&e[f][]=10&e[g][]=11&e[g][]=12&e[h]=13", "Make sure params are not double-encoded." );
// #7945 // #7945
assert.equal( jQuery.param( { "jquery": "1.4.2" } ), "jquery=1.4.2", "Check that object with a jQuery property get serialized correctly" ); assert.equal( jQuery.param( { "jquery": "1.4.2" } ), "jquery=1.4.2", "Check that object with a jQuery property get serialized correctly" );
@ -52,13 +52,13 @@ QUnit.test( "jQuery.param()", function( assert ) {
params = { "foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us" }; params = { "foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us" };
assert.equal( jQuery.param( params, true ), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" ); assert.equal( jQuery.param( params, true ), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
params = { a:[ 1,2 ], b:{ c:3, d:[ 4,5 ], e:{ x:[ 6 ], y:7, z:[ 8,9 ] }, f:true, g:false, h:undefined }, i:[ 10,11 ], j:true, k:false, l:[ undefined,0 ], m:"cowboy hat?" }; params = { a:[ 1, 2 ], b:{ c:3, d:[ 4, 5 ], e:{ x:[ 6 ], y:7, z:[ 8, 9 ] }, f:true, g:false, h:undefined }, i:[ 10, 11 ], j:true, k:false, l:[ undefined, 0 ], m:"cowboy hat?" };
assert.equal( jQuery.param( params, true ), "a=1&a=2&b=%5Bobject%20Object%5D&i=10&i=11&j=true&k=false&l=&l=0&m=cowboy%20hat%3F", "huge structure" ); assert.equal( jQuery.param( params, true ), "a=1&a=2&b=%5Bobject%20Object%5D&i=10&i=11&j=true&k=false&l=&l=0&m=cowboy%20hat%3F", "huge structure" );
params = { "a": [ 0, [ 1, 2 ], [ 3, [ 4, 5 ], [ 6 ] ], { "b": [ 7, [ 8, 9 ], [ { "c": 10, d: 11 } ], [ [ 12 ] ], [ [ [ 13 ] ] ], { "e": { "f": { "g": [ 14, [ 15 ] ] } } }, 16 ] }, 17 ] }; params = { "a": [ 0, [ 1, 2 ], [ 3, [ 4, 5 ], [ 6 ] ], { "b": [ 7, [ 8, 9 ], [ { "c": 10, d: 11 } ], [ [ 12 ] ], [ [ [ 13 ] ] ], { "e": { "f": { "g": [ 14, [ 15 ] ] } } }, 16 ] }, 17 ] };
assert.equal( jQuery.param( params, true ), "a=0&a=1%2C2&a=3%2C4%2C5%2C6&a=%5Bobject%20Object%5D&a=17", "nested arrays (not possible when traditional == true)" ); assert.equal( jQuery.param( params, true ), "a=0&a=1%2C2&a=3%2C4%2C5%2C6&a=%5Bobject%20Object%5D&a=17", "nested arrays (not possible when traditional == true)" );
params = { a:[ 1,2 ], b:{ c:3, d:[ 4,5 ], e:{ x:[ 6 ], y:7, z:[ 8,9 ] }, f:true, g:false, h:undefined }, i:[ 10,11 ], j:true, k:false, l:[ undefined,0 ], m:"cowboy hat?" }; params = { a:[ 1, 2 ], b:{ c:3, d:[ 4, 5 ], e:{ x:[ 6 ], y:7, z:[ 8, 9 ] }, f:true, g:false, h:undefined }, i:[ 10, 11 ], j:true, k:false, l:[ undefined, 0 ], m:"cowboy hat?" };
assert.equal( decodeURIComponent( jQuery.param( params ) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=&i[]=10&i[]=11&j=true&k=false&l[]=&l[]=0&m=cowboy hat?", "huge structure, forced not traditional" ); assert.equal( decodeURIComponent( jQuery.param( params ) ), "a[]=1&a[]=2&b[c]=3&b[d][]=4&b[d][]=5&b[e][x][]=6&b[e][y]=7&b[e][z][]=8&b[e][z][]=9&b[f]=true&b[g]=false&b[h]=&i[]=10&i[]=11&j=true&k=false&l[]=&l[]=0&m=cowboy hat?", "huge structure, forced not traditional" );
params = { "param1": null }; params = { "param1": null };
@ -92,7 +92,7 @@ QUnit.test( "jQuery.param() Constructed prop values", function( assert ) {
/** @constructor */ /** @constructor */
function Record() { function Record() {
this[ "prop" ] = "val"; this.prop = "val";
} }
var MyString = String, var MyString = String,