Skip to content

Selector: Properly deprecate jQuery.expr[ ":" ]/jQuery.expr.filters #5570

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
Nov 5, 2024
Merged

Selector: Properly deprecate jQuery.expr[ ":" ]/jQuery.expr.filters #5570

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: 4 additions & 0 deletions src/deprecated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,8 @@ jQuery.trim = function( text ) {
"" :
( text + "" ).replace( rtrim, "$1" );
};

jQuery.expr[ ":" ] = jQuery.expr.filters = jQuery.expr.pseudos;
jQuery.unique = jQuery.uniqueSort;

} );
1 change: 0 additions & 1 deletion src/selector-native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ jQuery.extend( {
// elements in the full selector module. This will be a minor
// breaking change in 4.0.0.
uniqueSort: uniqueSort,
unique: uniqueSort,

find: function( selector, context, results, seed ) {
var elem, nodeType,
Expand Down
6 changes: 1 addition & 5 deletions src/selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ for ( i in { submit: true, reset: true } ) {

// Easy API for creating new setFilters
function setFilters() {}
setFilters.prototype = Expr.filters = Expr.pseudos;
setFilters.prototype = Expr.pseudos;
Expr.setFilters = new setFilters();

function tokenize( selector, parseOnly ) {
Expand Down Expand Up @@ -2092,10 +2092,6 @@ support.sortDetached = assert( function( el ) {

jQuery.find = find;

// Deprecated
jQuery.expr[ ":" ] = jQuery.expr.pseudos;
jQuery.unique = jQuery.uniqueSort;

// These have always been private, but they used to be documented as part of
// Sizzle so let's maintain them for now for backwards compatibility purposes.
find.compile = compile;
Expand Down
20 changes: 20 additions & 0 deletions test/unit/deprecated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,4 +704,24 @@ if ( includesModule( "deferred" ) ) {
} );
}

if ( includesModule( "selector" ) ) {
QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ](
"jQuery.expr[ \":\" ], jQuery.expr.filters",
function( assert ) {
assert.expect( 2 );

assert.strictEqual( jQuery.expr[ ":" ], jQuery.expr.pseudos,
"jQuery.expr[ \":\" ] is an alias of jQuery.expr.pseudos" );
assert.strictEqual( jQuery.expr.filters, jQuery.expr.pseudos,
"jQuery.expr.filters is an alias of jQuery.expr.pseudos" );
} );
}

QUnit.test( "jQuery.unique", function( assert ) {
assert.expect( 1 );

assert.strictEqual( jQuery.unique, jQuery.uniqueSort,
"jQuery.unique is an alias of jQuery.uniqueSort" );
} );

}
20 changes: 10 additions & 10 deletions test/unit/selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2346,10 +2346,10 @@ QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ]( "custom pseudos", function( as
assert.expect( 6 );

try {
jQuery.expr.filters.foundation = jQuery.expr.filters.root;
jQuery.expr.pseudos.foundation = jQuery.expr.pseudos.root;
assert.deepEqual( jQuery.find( ":foundation" ), [ document.documentElement ], "Copy element filter with new name" );
} finally {
delete jQuery.expr.filters.foundation;
delete jQuery.expr.pseudos.foundation;
}

try {
Expand All @@ -2360,25 +2360,25 @@ QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ]( "custom pseudos", function( as
}

try {
jQuery.expr.filters.aristotlean = jQuery.expr.createPseudo( function() {
jQuery.expr.pseudos.aristotlean = jQuery.expr.createPseudo( function() {
return function( elem ) {
return !!elem.id;
};
} );
assert.t( "Custom element filter", "#foo :aristotlean", [ "sndp", "en", "yahoo", "sap", "anchor2", "timmy" ] );
} finally {
delete jQuery.expr.filters.aristotlean;
delete jQuery.expr.pseudos.aristotlean;
}

try {
jQuery.expr.filters.endswith = jQuery.expr.createPseudo( function( text ) {
jQuery.expr.pseudos.endswith = jQuery.expr.createPseudo( function( text ) {
return function( elem ) {
return jQuery.text( elem ).slice( -text.length ) === text;
};
} );
assert.t( "Custom element filter with argument", "a:endswith(ogle)", [ "google" ] );
} finally {
delete jQuery.expr.filters.endswith;
delete jQuery.expr.pseudos.endswith;
}

try {
Expand All @@ -2392,7 +2392,7 @@ QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ]( "custom pseudos", function( as
} );
assert.t( "Custom set filter", "#qunit-fixture p:second", [ "ap" ] );
} finally {
delete jQuery.expr.filters.second;
delete jQuery.expr.setFilters.second;
}

try {
Expand All @@ -2412,20 +2412,20 @@ QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ]( "custom pseudos", function( as
} );
assert.t( "Custom set filter with argument", "#qunit-fixture p:slice(1:3)", [ "ap", "sndp" ] );
} finally {
delete jQuery.expr.filters.slice;
delete jQuery.expr.setFilters.slice;
}
} );

QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ]( "backwards-compatible custom pseudos", function( assert ) {
assert.expect( 3 );

try {
jQuery.expr.filters.icontains = function( elem, i, match ) {
jQuery.expr.pseudos.icontains = function( elem, i, match ) {
return jQuery.text( elem ).toLowerCase().indexOf( ( match[ 3 ] || "" ).toLowerCase() ) > -1;
};
assert.t( "Custom element filter with argument", "a:icontains(THIS BLOG ENTRY)", [ "john1" ] );
} finally {
delete jQuery.expr.filters.icontains;
delete jQuery.expr.pseudos.icontains;
}

try {
Expand Down
Loading