enmi-conf.org: comparison wp/wp-includes/js/wp-api.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/wp-api.js

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 21	48c4eec2b7e6

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 			 * Build a helper function to retrieve related model.
 			 *
 			 * @param {string} parentModel      The parent model.
 			 * @param {number} modelId          The model ID if the object to request
 			 * @param {string} modelName        The model name to use when constructing the model.
-			 * @param {string} embedSourcePoint Where to check the embedds object for _embed data.
+			 * @param {string} embedSourcePoint Where to check the embedded object for _embed data.
 			 * @param {string} embedCheckField  Which model field to check to see if the model has data.
 			 *
 			 * @return {Deferred.promise}        A promise which resolves to the constructed model.
 			 */
 			buildModelGetter = function( parentModel, modelId, modelName, embedSourcePoint, embedCheckField ) {
-				var getModel, embeddeds, attributes, deferred;
+				var getModel, embeddedObjects, attributes, deferred;
-				deferred  = jQuery.Deferred();
+				deferred        = jQuery.Deferred();
-				embeddeds = parentModel.get( '_embedded' ) || {};
+				embeddedObjects = parentModel.get( '_embedded' ) || {};
 				// Verify that we have a valid object id.
 				if ( ! _.isNumber( modelId ) || 0 === modelId ) {
 					deferred.reject();
 					return deferred;
 				}
 				// If we have embedded object data, use that when constructing the getModel.
-				if ( embeddeds[ embedSourcePoint ] ) {
+				if ( embeddedObjects[ embedSourcePoint ] ) {
-					attributes = _.findWhere( embeddeds[ embedSourcePoint ], { id: modelId } );
+					attributes = _.findWhere( embeddedObjects[ embedSourcePoint ], { id: modelId } );
 				}
 				// Otherwise use the modelId.
 				if ( ! attributes ) {
 					attributes = { id: modelId };
 			/**
 			 * Build a helper to retrieve a collection.
 			 *
 			 * @param {string} parentModel      The parent model.
 			 * @param {string} collectionName   The name to use when constructing the collection.
-			 * @param {string} embedSourcePoint Where to check the embedds object for _embed data.
+			 * @param {string} embedSourcePoint Where to check the embedded object for _embed data.
-			 * @param {string} embedIndex       An addiitonal optional index for the _embed data.
+			 * @param {string} embedIndex       An additional optional index for the _embed data.
 			 *
 			 * @return {Deferred.promise} A promise which resolves to the constructed collection.
 			 */
 			buildCollectionGetter = function( parentModel, collectionName, embedSourcePoint, embedIndex ) {
 				/**
 				 * Returns a promise that resolves to the requested collection
 				 *
-				 * Uses the embedded data if available, otherwises fetches the
+				 * Uses the embedded data if available, otherwise fetches the
 				 * data from the server.
 				 *
 				 * @return {Deferred.promise} promise Resolves to a wp.api.collections[ collectionName ]
 				 * collection.
 				 */
-				var postId, embeddeds, getObjects,
+				var postId, embeddedObjects, getObjects,
 					classProperties = '',
 					properties      = '',
 					deferred        = jQuery.Deferred();
-				postId    = parentModel.get( 'id' );
+				postId          = parentModel.get( 'id' );
-				embeddeds = parentModel.get( '_embedded' ) || {};
+				embeddedObjects = parentModel.get( '_embedded' ) || {};
 				// Verify that we have a valid post ID.
 				if ( ! _.isNumber( postId ) || 0 === postId ) {
 					deferred.reject();
 					return deferred;
 				}
 				// If we have embedded getObjects data, use that when constructing the getObjects.
-				if ( ! _.isUndefined( embedSourcePoint ) && ! _.isUndefined( embeddeds[ embedSourcePoint ] ) ) {
+				if ( ! _.isUndefined( embedSourcePoint ) && ! _.isUndefined( embeddedObjects[ embedSourcePoint ] ) ) {
 					// Some embeds also include an index offset, check for that.
 					if ( _.isUndefined( embedIndex ) ) {
 						// Use the embed source point directly.
-						properties = embeddeds[ embedSourcePoint ];
+						properties = embeddedObjects[ embedSourcePoint ];
 					} else {
 						// Add the index to the embed source point.
-						properties = embeddeds[ embedSourcePoint ][ embedIndex ];
+						properties = embeddedObjects[ embedSourcePoint ][ embedIndex ];
 					}
 				} else {
 					// Otherwise use the postId.
 					classProperties = { parent: postId };
 							return success.apply( this, arguments );
 						}
 					};
 				}
-				// Continue by calling Bacckbone's sync.
+				// Continue by calling Backbone's sync.
 				return Backbone.sync( method, model, options );
 			},
 			/**
 			 * Fetches the next page of objects if a new page exists.
 					loadingObjects.collections[ collectionClassName ] = wp.api.WPApiBaseCollection.extend( {
 						// Function that returns a constructed url passed on the parent.
 						url: function() {
 							return routeModel.get( 'apiRoot' ) + routeModel.get( 'versionString' ) +
-									parentName + '/' + this.parent + '/' +
+								parentName + '/' +
-									routeName;
+								( ( _.isUndefined( this.parent ) || '' === this.parent ) ?
+									( _.isUndefined( this.get( 'parent_post' ) ) ? '' : this.get( 'parent_post' ) + '/' ) :
+									this.parent + '/' ) +
+								routeName;
 						},
 						// Specify the model that this collection contains.
 						model: function( attrs, options ) {
 							return new loadingObjects.models[ modelClassName ]( attrs, options );

enmi-conf.org