Skip to content

Tests: Update jQuery Migrate from 3.3.0 to 3.3.1 #1932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgol merged 1 commit into from
Jul 27, 2020
Merged

Tests: Update jQuery Migrate from 3.3.0 to 3.3.1 #1932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,8 @@ grunt.initConfig( {
"jquery-migrate-1.4.1/jquery-migrate.js": "jquery-migrate-1.4.1/dist/jquery-migrate.js",
"jquery-migrate-1.4.1/LICENSE.txt": "jquery-migrate-1.4.1/LICENSE.txt",

"jquery-migrate-3.3.0/jquery-migrate.js": "jquery-migrate-3.3.0/dist/jquery-migrate.js",
"jquery-migrate-3.3.0/LICENSE.txt": "jquery-migrate-3.3.0/LICENSE.txt"
"jquery-migrate-3.3.1/jquery-migrate.js": "jquery-migrate-3.3.1/dist/jquery-migrate.js",
"jquery-migrate-3.3.1/LICENSE.txt": "jquery-migrate-3.3.1/LICENSE.txt"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@
"jquery-3.5.0": "jquery#3.5.0",
"jquery-3.5.1": "jquery#3.5.1",
"jquery-migrate-1.4.1": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz",
"jquery-migrate-3.3.0": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.0.tgz"
"jquery-migrate-3.3.1": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.1.tgz"
}
}
0 external/jquery-migrate-3.3.0/LICENSE.txt → external/jquery-migrate-3.3.1/LICENSE.txt
View file
Open in desktop
File renamed without changes.
31 changes: 14 additions & 17 deletions ...al/jquery-migrate-3.3.0/jquery-migrate.js → ...al/jquery-migrate-3.3.1/jquery-migrate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* jQuery Migrate - v3.3.0 - 2020-05-05T01:57Z
* jQuery Migrate - v3.3.1 - 2020-06-25T01:07Z
* Copyright OpenJS Foundation and other contributors
*/
( function( factory ) {
Expand All @@ -24,7 +24,7 @@
} )( function( jQuery, window ) {
"use strict";

jQuery.migrateVersion = "3.3.0";
jQuery.migrateVersion = "3.3.1";

// Returns 0 if v1 == v2, -1 if v1 < v2, 1 if v1 > v2
function compareVersions( v1, v2 ) {
Expand Down Expand Up @@ -469,14 +469,19 @@ function isAutoPx( prop ) {
oldFnCss = jQuery.fn.css;

jQuery.fn.css = function( name, value ) {
var origThis = this;
if ( typeof name !== "string" ) {
var camelName,
origThis = this;
if ( name && typeof name === "object" && !Array.isArray( name ) ) {
jQuery.each( name, function( n, v ) {
jQuery.fn.css.call( origThis, n, v );
} );
}
if ( typeof value === "number" && !isAutoPx( camelCase( name ) ) ) {
migrateWarn( "Use of number-typed values is deprecated in jQuery.fn.css" );
if ( typeof value === "number" ) {
camelName = camelCase( name );
if ( !isAutoPx( camelName ) && !jQuery.cssNumber[ camelName ] ) {
migrateWarn( "Number-typed values are deprecated for jQuery.fn.css( \"" +
name + "\", value )" );
}
}

return oldFnCss.apply( this, arguments );
Expand Down Expand Up @@ -725,19 +730,11 @@ jQuery.htmlPrefilter = function( html ) {
var oldOffset = jQuery.fn.offset;

jQuery.fn.offset = function() {
var docElem,
elem = this[ 0 ],
bogus = { top: 0, left: 0 };
var elem = this[ 0 ];

if ( !elem || !elem.nodeType ) {
if ( elem && ( !elem.nodeType || !elem.getBoundingClientRect ) ) {
migrateWarn( "jQuery.fn.offset() requires a valid DOM element" );
return undefined;
}

docElem = ( elem.ownerDocument || window.document ).documentElement;
if ( !jQuery.contains( docElem, elem ) ) {
migrateWarn( "jQuery.fn.offset() requires an element connected to a document" );
return bogus;
return arguments.length ? this : undefined;
}

return oldOffset.apply( this, arguments );
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function migrateUrl() {
if ( jqueryVersion === "git" ) {
url = "https://code.jquery.com/jquery-migrate-git";
} else if ( jqueryVersion[ 0 ] === "3" ) {
url = "../../../external/jquery-migrate-3.3.0/jquery-migrate";
url = "../../../external/jquery-migrate-3.3.1/jquery-migrate";
} else if ( jqueryVersion[ 0 ] === "1" || jqueryVersion[ 0 ] === "2" ) {
url = "../../../external/jquery-migrate-1.4.1/jquery-migrate";
} else if ( jqueryVersion === "custom" ) {
Expand Down