Skip to content

Fix mixin data merging documentation #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/v2/guide/mixins.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var component = new Component() // => "hello from mixin!"

When a mixin and the component itself contain overlapping options, they will be "merged" using appropriate strategies.

For example, data objects undergo a shallow merge (one property deep), with the component's data taking priority in cases of conflicts.
For example, data objects undergo a recursive merge, with the component's data taking priority in cases of conflicts.

``` js
var mixin = {
Expand Down