Skip to content
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
Fix mixin data merging documentation
  • Loading branch information
vetruvet authored Dec 7, 2018
commit 50c4e3789f908a76b14e9cc75ffe840da5b1a26d
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