Skip to content
This repository was archived by the owner on Sep 5, 2018. It is now read-only.

wp.api.utils.decorateFromRoute should use _.extend not _.union #154

Merged
merged 2 commits into from
Jan 12, 2017
Merged

wp.api.utils.decorateFromRoute should use _.extend not _.union #154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae993af
Clean up processing/build of args & options for built objects
adamsilverstein Dec 20, 2016
e15666a
whitespace remove extra tab
adamsilverstein Dec 20, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@
// Add any non empty args, merging them into the args object.
if ( ! _.isEmpty( routeEndpoint.args ) ) {

// Set as defauls if no args yet.
// Set as default if no args yet.
if ( _.isEmpty( modelInstance.prototype.args ) ) {
modelInstance.prototype.args = routeEndpoint.args;
} else {

// We already have args, merge these new args in.
modelInstance.prototype.args = _.union( routeEndpoint.args, modelInstance.prototype.defaults );
modelInstance.prototype.args = _.extend( modelInstance.prototype.args, routeEndpoint.args );
}
}
} else {
Expand All @@ -178,7 +178,7 @@
} else {

// We already have options, merge these new args in.
modelInstance.prototype.options = _.union( routeEndpoint.args, modelInstance.prototype.options );
modelInstance.prototype.options = _.extend( modelInstance.prototype.options, routeEndpoint.args );
}
}

Expand Down