Ajax: Deprecate AJAX event aliases, inline event/alias into deprecated

A new `src/deprecated` directory makes it possible to exclude some deprecated
APIs from a custom build when their respective "parent" module is excluded
without keeping that module outside of the `src/deprecated` directory or
the `src/deprecated.js` file.

Closes gh-4572
This commit is contained in:
Michał Gołębiowski-Owczarek 2020-01-21 14:12:35 +01:00 committed by GitHub
parent 865469f5e6
commit 23d53928f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 50 additions and 52 deletions

View File

@ -58,14 +58,15 @@ module.exports = function( grunt ) {
// Exclude specified modules if the module matching the key is removed // Exclude specified modules if the module matching the key is removed
removeWith: { removeWith: {
ajax: [ "manipulation/_evalUrl", "event/ajax" ], ajax: [ "manipulation/_evalUrl", "deprecated/ajax-event-alias" ],
callbacks: [ "deferred" ], callbacks: [ "deferred" ],
css: [ "effects", "dimensions", "offset" ], css: [ "effects", "dimensions", "offset" ],
"css/showHide": [ "effects" ], "css/showHide": [ "effects" ],
deferred: { deferred: {
remove: [ "ajax", "effects", "queue", "core/ready" ], remove: [ "ajax", "effects", "queue", "core/ready" ],
include: [ "core/ready-no-deferred" ] include: [ "core/ready-no-deferred" ]
} },
event: [ "deprecated/ajax-event-alias", "deprecated/event" ]
} }
} }
}, },

View File

@ -86,8 +86,7 @@ Some example modules that can be excluded are:
- **deprecated**: Methods documented as deprecated but not yet removed. - **deprecated**: Methods documented as deprecated but not yet removed.
- **dimensions**: The `.width()` and `.height()` methods, including `inner-` and `outer-` variations. - **dimensions**: The `.width()` and `.height()` methods, including `inner-` and `outer-` variations.
- **effects**: The `.animate()` method and its shorthands such as `.slideUp()` or `.hide("slow")`. - **effects**: The `.animate()` method and its shorthands such as `.slideUp()` or `.hide("slow")`.
- **event**: The `.on()` and `.off()` methods and all event functionality. Also removes `event/alias`. - **event**: The `.on()` and `.off()` methods and all event functionality.
- **event/alias**: All event attaching/triggering shorthands like `.click()` or `.mouseover()`.
- **event/trigger**: The `.trigger()` and `.triggerHandler()` methods. Used by the **alias** module. - **event/trigger**: The `.trigger()` and `.triggerHandler()` methods. Used by the **alias** module.
- **offset**: The `.offset()`, `.position()`, `.offsetParent()`, `.scrollLeft()`, and `.scrollTop()` methods. - **offset**: The `.offset()`, `.position()`, `.offsetParent()`, `.scrollLeft()`, and `.scrollTop()` methods.
- **wrap**: The `.wrap()`, `.wrapAll()`, `.wrapInner()`, and `.unwrap()` methods. - **wrap**: The `.wrap()`, `.wrapAll()`, `.wrapInner()`, and `.unwrap()` methods.
@ -143,7 +142,7 @@ grunt custom:-css
Exclude a bunch of modules: Exclude a bunch of modules:
```bash ```bash
grunt custom:-ajax,-css,-deprecated,-dimensions,-effects,-event/alias,-offset,-wrap grunt custom:-ajax/jsonp,-css,-deprecated,-dimensions,-effects,-offset,-wrap
``` ```
There is also a special alias to generate a build with the same configuration as the official jQuery Slim build is generated: There is also a special alias to generate a build with the same configuration as the official jQuery Slim build is generated:

View File

@ -2,28 +2,8 @@ import jQuery from "./core.js";
import slice from "./var/slice.js"; import slice from "./var/slice.js";
import trim from "./var/trim.js"; import trim from "./var/trim.js";
import "./event/alias.js"; import "./deprecated/ajax-event-alias.js";
import "./deprecated/event.js";
jQuery.fn.extend( {
bind: function( types, data, fn ) {
return this.on( types, null, data, fn );
},
unbind: function( types, fn ) {
return this.off( types, null, fn );
},
delegate: function( selector, types, data, fn ) {
return this.on( types, selector, data, fn );
},
undelegate: function( selector, types, fn ) {
// ( namespace ) or ( selector, types [, fn] )
return arguments.length === 1 ?
this.off( selector, "**" ) :
this.off( types, selector || "**", fn );
}
} );
// Bind a function to a context, optionally partially applying any // Bind a function to a context, optionally partially applying any
// arguments. // arguments.

View File

@ -1,8 +1,8 @@
import jQuery from "../core.js"; import jQuery from "../core.js";
import "../ajax.js";
import "../event.js"; import "../event.js";
// Attach a bunch of functions for handling common AJAX events
jQuery.each( [ jQuery.each( [
"ajaxStart", "ajaxStart",
"ajaxStop", "ajaxStop",

42
src/deprecated/event.js Normal file
View File

@ -0,0 +1,42 @@
import jQuery from "../core.js";
import "../event.js";
import "../event/trigger.js";
jQuery.fn.extend( {
bind: function( types, data, fn ) {
return this.on( types, null, data, fn );
},
unbind: function( types, fn ) {
return this.off( types, null, fn );
},
delegate: function( selector, types, data, fn ) {
return this.on( types, selector, data, fn );
},
undelegate: function( selector, types, fn ) {
// ( namespace ) or ( selector, types [, fn] )
return arguments.length === 1 ?
this.off( selector, "**" ) :
this.off( types, selector || "**", fn );
},
hover: function( fnOver, fnOut ) {
return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
}
} );
jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
function( _i, name ) {
// Handle event binding
jQuery.fn[ name ] = function( data, fn ) {
return arguments.length > 0 ?
this.on( name, null, data, fn ) :
this.trigger( name );
};
} );

View File

@ -1,23 +0,0 @@
import jQuery from "../core.js";
import "../event.js";
import "./trigger.js";
jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
function( _i, name ) {
// Handle event binding
jQuery.fn[ name ] = function( data, fn ) {
return arguments.length > 0 ?
this.on( name, null, data, fn ) :
this.trigger( name );
};
} );
jQuery.fn.extend( {
hover: function( fnOver, fnOut ) {
return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
}
} );

1
src/jquery.js vendored
View File

@ -24,7 +24,6 @@ import "./ajax/jsonp.js";
import "./ajax/load.js"; import "./ajax/load.js";
import "./core/parseXML.js"; import "./core/parseXML.js";
import "./core/parseHTML.js"; import "./core/parseHTML.js";
import "./event/ajax.js";
import "./effects.js"; import "./effects.js";
import "./effects/animatedSelector.js"; import "./effects/animatedSelector.js";
import "./offset.js"; import "./offset.js";