Changeset 12419

Timestamp:

07/30/2019 12:02:30 PM (5 years ago)

Author:

imath

Message:

Set dataType option by default to JSON in bp.apiRequest

Fixes #8117

File:

• trunk/src/bp-core/js/bp-api-request.js (modified) (1 diff)

trunk/src/bp-core/js/bp-api-request.js

@@ -17 +17 @@
 
     // Polyfill wp.apiRequest if WordPress < 4.9
-    bp.apiRequest = wp.apiRequest || function( options ) {
-        var url = bpApiSettings.root;
-
-        if ( options.path ) {
-            url = url + options.path.replace( /^\//, '' );
+    bp.apiRequest = function( options ) {
+        if ( ! options.dataType ) {
+            options.dataType = 'json';
         }
 
-        options.url = url;
-        options.beforeSend = function( xhr ) {
-            xhr.setRequestHeader( 'X-WP-Nonce', bpApiSettings.nonce );
-        };
+        // WordPress is >= 4.9.0.
+        if ( wp.apiRequest ) {
+            return wp.apiRequest( options );
 
-        return $.ajax( options );
+        // WordPress is < 4.9.0.
+        } else {
+            var url = bpApiSettings.root;
+
+            if ( options.path ) {
+                url = url + options.path.replace( /^\//, '' );
+            }
+
+            options.url = url;
+            options.beforeSend = function( xhr ) {
+                xhr.setRequestHeader( 'X-WP-Nonce', bpApiSettings.nonce );
+            };
+
+            return $.ajax( options );
+        }
     };