Changeset 24652

Timestamp:

07/11/2013 12:20:36 AM (12 years ago)

Author:

nacin

Message:

Rename wp.xhr to wp.ajax to match admin-ajax.php (which it uses), jQuery.ajax (which it wraps), etc. see #24424.

Location:

trunk

Files:

• wp-admin/js/revisions.js (modified) (1 diff)
• wp-includes/js/media-models.js (modified) (2 diffs)
• wp-includes/js/wp-util.js (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/js/revisions.js

@@ -208 +208 @@
                 });
 
-                var deferred = wp.xhr.send( options );
+                var deferred = wp.ajax.send( options );
                 var requests = this.requests;
 

trunk/wp-includes/js/media-models.js

@@ -102 +102 @@
          *
          * 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,
 
         /**
@@ -110 +110 @@
          *
          * 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.

trunk/wp-includes/js/wp-util.js

@@ -29 +29 @@
     });
 
-    // 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.
@@ -47 +47 @@
          */
         post: function( action, data ) {
-            return wp.xhr.send({
+            return wp.ajax.send({
                 data: _.isObject( action ) ? action : _.extend( data || {}, { action: action })
             });
@@ -53 +53 @@
 
         /**
-         * wp.xhr.send( [action], [options] )
+         * wp.ajax.send( [action], [options] )
          *
          * Sends a POST request to WordPress.
@@ -71 +71 @@
             options = _.defaults( options || {}, {
                 type:    'POST',
-                url:     wp.xhr.settings.url,
+                url:     wp.ajax.settings.url,
                 context: this
             });

trunk/wp-includes/script-loader.php

@@ -270 +270 @@
     $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' ),
         ),