Ticket #39683: 39683.diff

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

@@ -1095 +1095 @@
                         /**
                          * 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 ) {
 
@@ -1266 +1266 @@
                                         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 ) {
@@ -1293 +1295 @@
                                 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.
@@ -1313 +1317 @@
                 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;
@@ -1321 +1325 @@
                 }
 
                 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;
                 }