Changeset 39680

Timestamp:

01/05/2017 03:02:39 AM (8 years ago)

Author:

adamsilverstein

Message:

REST API: Add error handling for fetch error in buildModelGetter of wp-api.js.

When a call to a model getter method fails, reject the returned deferred object. Enables better handling of fetch errors.

Props westonruter, adamsilverstein.
Fixes #39314.

File:

• trunk/src/wp-includes/js/wp-api.js (modified) (2 diffs)

trunk/src/wp-includes/js/wp-api.js

@@ -322 +322 @@
                 getModel = new wp.api.models[ modelName ]( attributes );
 
-                // If we didn’t have an embedded getModel, fetch the getModel data.
                 if ( ! getModel.get( embedCheckField ) ) {
-                    getModel.fetch( { success: function( getModel ) {
-                        deferred.resolve( getModel );
-                    } } );
+                    getModel.fetch( {
+                        success: function( getModel ) {
+                            deferred.resolve( getModel );
+                        },
+                        error: function( getModel, response ) {
+                            deferred.reject( response );
+                        }
+                    } );
                 } else {
+                    // Resolve with the embedded model.
                     deferred.resolve( getModel );
                 }
@@ -393 +398 @@
                 // If we didn’t have embedded getObjects, fetch the getObjects data.
                 if ( _.isUndefined( getObjects.models[0] ) ) {
-                    getObjects.fetch( { success: function( getObjects ) {
-
-                        // Add a helper 'parent_post' attribute onto the model.
-                        setHelperParentPost( getObjects, postId );
-                        deferred.resolve( getObjects );
-                    } } );
+                    getObjects.fetch( {
+                        success: function( getObjects ) {
+
+                            // Add a helper 'parent_post' attribute onto the model.
+                            setHelperParentPost( getObjects, postId );
+                            deferred.resolve( getObjects );
+                        },
+                        error: function( getModel, response ) {
+                            deferred.reject( response );
+                        }
+                    } );
                 } else {