Rename wp.xhr to wp.ajax to match admin-ajax.php (which it uses), jQuery.ajax (which it wraps), etc. see #24424.
git-svn-id: http://core.svn.wordpress.org/trunk@24652 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
031d959efd
commit
721f7ba271
|
@ -207,7 +207,7 @@ window.wp = window.wp || {};
|
|||
post_id: revisions.settings.postId
|
||||
});
|
||||
|
||||
var deferred = wp.xhr.send( options );
|
||||
var deferred = wp.ajax.send( options );
|
||||
var requests = this.requests;
|
||||
|
||||
// Record that we're requesting each diff.
|
||||
|
|
|
@ -101,17 +101,17 @@ window.wp = window.wp || {};
|
|||
* media.post( [action], [data] )
|
||||
*
|
||||
* Sends a POST request to WordPress.
|
||||
* See wp.xhr.post() in `wp-includes/js/wp-util.js`.
|
||||
* See wp.ajax.post() in `wp-includes/js/wp-util.js`.
|
||||
*/
|
||||
post: wp.xhr.post,
|
||||
post: wp.ajax.post,
|
||||
|
||||
/**
|
||||
* media.ajax( [action], [options] )
|
||||
*
|
||||
* Sends an XHR request to WordPress.
|
||||
* See wp.xhr.send() in `wp-includes/js/wp-util.js`.
|
||||
* See wp.ajax.send() in `wp-includes/js/wp-util.js`.
|
||||
*/
|
||||
ajax: wp.xhr.send,
|
||||
ajax: wp.ajax.send,
|
||||
|
||||
// Scales a set of dimensions to fit within bounding dimensions.
|
||||
fit: function( dimensions ) {
|
||||
|
|
|
@ -28,16 +28,16 @@ window.wp = window.wp || {};
|
|||
};
|
||||
});
|
||||
|
||||
// wp.xhr
|
||||
// wp.ajax
|
||||
// ------
|
||||
//
|
||||
// Tools for sending ajax requests with JSON responses and built in error handling.
|
||||
// Mirrors and wraps jQuery's ajax APIs.
|
||||
wp.xhr = {
|
||||
settings: settings.xhr || {},
|
||||
wp.ajax = {
|
||||
settings: settings.ajax || {},
|
||||
|
||||
/**
|
||||
* wp.xhr.post( [action], [data] )
|
||||
* wp.ajax.post( [action], [data] )
|
||||
*
|
||||
* Sends a POST request to WordPress.
|
||||
*
|
||||
|
@ -46,13 +46,13 @@ window.wp = window.wp || {};
|
|||
* @return {$.promise} A jQuery promise that represents the request.
|
||||
*/
|
||||
post: function( action, data ) {
|
||||
return wp.xhr.send({
|
||||
return wp.ajax.send({
|
||||
data: _.isObject( action ) ? action : _.extend( data || {}, { action: action })
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* wp.xhr.send( [action], [options] )
|
||||
* wp.ajax.send( [action], [options] )
|
||||
*
|
||||
* Sends a POST request to WordPress.
|
||||
*
|
||||
|
@ -70,7 +70,7 @@ window.wp = window.wp || {};
|
|||
|
||||
options = _.defaults( options || {}, {
|
||||
type: 'POST',
|
||||
url: wp.xhr.settings.url,
|
||||
url: wp.ajax.settings.url,
|
||||
context: this
|
||||
});
|
||||
|
||||
|
|
|
@ -269,7 +269,7 @@ function wp_default_scripts( &$scripts ) {
|
|||
|
||||
$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 );
|
||||
did_action( 'init' ) && $scripts->localize( 'wp-util', '_wpUtilSettings', array(
|
||||
'xhr' => array(
|
||||
'ajax' => array(
|
||||
'url' => admin_url( 'admin-ajax.php', 'relative' ),
|
||||
),
|
||||
) );
|
||||
|
|
Loading…
Reference in New Issue