mirror of
https://github.com/WordPress/WordPress.git
synced 2024-11-14 22:56:19 +01:00
REST API: JS Client - Enable connecting to multiple endpoints.
Enable connecting to multiple wp-api `endpoints`. Calling `wp.api.init` with a new `apiRoot` will parse the new endpoint's schema and store a new set of models and collections. A collection of connected endpoints is stored in `wp.api.endpoints`. Props lucasstark. Fixes #39683. Merges [40364] to the 4.7 branch. Built from https://develop.svn.wordpress.org/branches/4.7@40735 git-svn-id: http://core.svn.wordpress.org/branches/4.7@40593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a86f61290e
commit
79988bff38
@ -1126,8 +1126,8 @@
|
||||
/**
|
||||
* Tracking objects for models and collections.
|
||||
*/
|
||||
loadingObjects.models = routeModel.get( 'models' );
|
||||
loadingObjects.collections = routeModel.get( 'collections' );
|
||||
loadingObjects.models = {};
|
||||
loadingObjects.collections = {};
|
||||
|
||||
_.each( routeModel.schemaModel.get( 'routes' ), function( route, index ) {
|
||||
|
||||
@ -1310,7 +1310,9 @@
|
||||
loadingObjects.collections[ collectionClassName ] = wp.api.WPApiBaseCollection.extend( {
|
||||
|
||||
// For the url of a root level collection, use a string.
|
||||
url: routeModel.get( 'apiRoot' ) + routeModel.get( 'versionString' ) + routeName,
|
||||
url: function() {
|
||||
return routeModel.get( 'apiRoot' ) + routeModel.get( 'versionString' ) + routeName;
|
||||
},
|
||||
|
||||
// Specify the model that this collection contains.
|
||||
model: function( attrs, options ) {
|
||||
@ -1337,13 +1339,15 @@
|
||||
loadingObjects.models[ index ] = wp.api.utils.addMixinsAndHelpers( model, index, loadingObjects );
|
||||
} );
|
||||
|
||||
// Set the routeModel models and collections.
|
||||
routeModel.set( 'models', loadingObjects.models );
|
||||
routeModel.set( 'collections', loadingObjects.collections );
|
||||
|
||||
}
|
||||
|
||||
} );
|
||||
|
||||
wp.api.endpoints = new Backbone.Collection( {
|
||||
model: Endpoint
|
||||
} );
|
||||
wp.api.endpoints = new Backbone.Collection();
|
||||
|
||||
/**
|
||||
* Initialize the wp-api, optionally passing the API root.
|
||||
@ -1357,28 +1361,30 @@
|
||||
var endpoint, attributes = {}, deferred, promise;
|
||||
|
||||
args = args || {};
|
||||
attributes.apiRoot = args.apiRoot || wpApiSettings.root;
|
||||
attributes.versionString = args.versionString || wpApiSettings.versionString;
|
||||
attributes.apiRoot = args.apiRoot || wpApiSettings.root || '/wp-json';
|
||||
attributes.versionString = args.versionString || wpApiSettings.versionString || 'wp/v2/';
|
||||
attributes.schema = args.schema || null;
|
||||
if ( ! attributes.schema && attributes.apiRoot === wpApiSettings.root && attributes.versionString === wpApiSettings.versionString ) {
|
||||
attributes.schema = wpApiSettings.schema;
|
||||
}
|
||||
|
||||
if ( ! initializedDeferreds[ attributes.apiRoot + attributes.versionString ] ) {
|
||||
endpoint = wp.api.endpoints.findWhere( { apiRoot: attributes.apiRoot, versionString: attributes.versionString } );
|
||||
|
||||
// Look for an existing copy of this endpoint
|
||||
endpoint = wp.api.endpoints.findWhere( { 'apiRoot': attributes.apiRoot, 'versionString': attributes.versionString } );
|
||||
if ( ! endpoint ) {
|
||||
endpoint = new Endpoint( attributes );
|
||||
wp.api.endpoints.add( endpoint );
|
||||
}
|
||||
deferred = jQuery.Deferred();
|
||||
promise = deferred.promise();
|
||||
|
||||
endpoint.schemaConstructed.done( function( endpoint ) {
|
||||
endpoint.schemaConstructed.done( function( resolvedEndpoint ) {
|
||||
wp.api.endpoints.add( resolvedEndpoint );
|
||||
|
||||
// Map the default endpoints, extending any already present items (including Schema model).
|
||||
wp.api.models = _.extend( endpoint.get( 'models' ), wp.api.models );
|
||||
wp.api.collections = _.extend( endpoint.get( 'collections' ), wp.api.collections );
|
||||
deferred.resolveWith( wp.api, [ endpoint ] );
|
||||
wp.api.models = _.extend( wp.api.models, resolvedEndpoint.get( 'models' ) );
|
||||
wp.api.collections = _.extend( wp.api.collections, resolvedEndpoint.get( 'collections' ) );
|
||||
deferred.resolve( resolvedEndpoint );
|
||||
} );
|
||||
initializedDeferreds[ attributes.apiRoot + attributes.versionString ] = promise;
|
||||
}
|
||||
|
2
wp-includes/js/wp-api.min.js
vendored
2
wp-includes/js/wp-api.min.js
vendored
File diff suppressed because one or more lines are too long
@ -4,7 +4,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.7.5-alpha-40724';
|
||||
$wp_version = '4.7.5-alpha-40735';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user