Skip to content

Refactor Mixins page into a more thorough Component Composition page #1221

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.

Sign up for GitHub

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Refactor Mixins page into a more thorough Component Composition page #1221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29f957a
refactor mixins into a new component composition page
chrisvfritz Oct 15, 2017
df1036b
add note about template literals on composition page
chrisvfritz Oct 16, 2017
087a891
clarify intro paragraph of composition.md
chrisvfritz Nov 11, 2017
0d704f6
correct <info-note> typo in composition.md
chrisvfritz Nov 11, 2017
5028f42
update composition.md close button examples to make more sense
chrisvfritz Nov 11, 2017
13120b4
add link to render function page in composition.md
chrisvfritz Nov 11, 2017
be6ab0d
add console.log example to demo global mixins
chrisvfritz Nov 11, 2017
6e8be5a
add note about higher order components on composition.md
chrisvfritz Nov 11, 2017
46f4fa0
add link to explanation of factory functions in composition.md
chrisvfritz Nov 11, 2017
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
3 changes: 2 additions & 1 deletion _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ alias:
guide/migration-vue-router.html: v2/guide/migration-vue-router.html
guide/migration-vuex.html: v2/guide/migration-vuex.html
guide/migration.html: v2/guide/migration.html
guide/mixins.html: v2/guide/mixins.html
guide/mixins.html: v2/guide/composition.html
v2/guide/mixins.html: v2/guide/composition.html
guide/plugins.html: v2/guide/plugins.html
guide/reactivity.html: v2/guide/reactivity.html
guide/render-function.html: v2/guide/render-function.html
Expand Down
8 changes: 5 additions & 3 deletions src/v2/api/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type: api

The merge strategy receives the value of that option defined on the parent and child instances as the first and second arguments, respectively. The context Vue instance is passed as the third argument.

- **See also:** [Custom Option Merging Strategies](../guide/mixins.html#Custom-Option-Merge-Strategies)
- **See also:** [Custom Merge Strategies](../guide/composition.html#Custom-Merge-Strategies)

### devtools

Expand Down Expand Up @@ -366,7 +366,7 @@ type: api

Apply a mixin globally, which affects every Vue instance created afterwards. This can be used by plugin authors to inject custom behavior into components. **Not recommended in application code**.

- **See also:** [Global Mixin](../guide/mixins.html#Global-Mixin)
- **See also:** [Global Mixins](../guide/composition.html#Global-Mixins)

<h3 id="Vue-compile">Vue.compile( template )</h3>

Expand Down Expand Up @@ -950,7 +950,7 @@ type: api
// => 2
```

- **See also:** [Mixins](../guide/mixins.html)
- **See also:** [Mixins](../guide/composition.html#Mixins)

### extends

Expand All @@ -974,6 +974,8 @@ type: api
}
```

- **See also:** [Extension](../guide/composition.html#Extension)

### provide / inject

> New in 2.2.0+
Expand Down
Loading