Skip to content

Commit

Permalink
Merge branch 'lang-ja' into feature/apply-new-textlint-preset
Browse files Browse the repository at this point in the history
* lang-ja: (28 commits)
  fix: json format quotation
  feature: add Vue 3 vueschool links
  Update custom-directive.md
  Fix: broken gif url
  fix: unify the words and leave colon as it is
  API Reference > Options DOM の翻訳を追従 (vuejs-jp#396)
  API Reference > Options Data の翻訳を追従 (vuejs-jp#395)
  Cookbook の翻訳を追従 (vuejs-jp#394)
  docs: elaborate on how style auto-prefixing works (vuejs-jp#393)
  Update introduction.md (vuejs-jp#392)
  docs: a few improvements (vuejs-jp#391)
  The description of this in setup is inconsistent with the source code (vuejs-jp#388)
  Add onActivated and onDeacitvated hooks to the list (vuejs-jp#387)
  docs: update recommended node version (vuejs-jp#386)
  fix: use method shorthands and switch indexOf to includes (vuejs-jp#385)
  fix: prevent CodePens from stealing focus and scrolling the page (vuejs-jp#384)
  docs: Update key-attribute.md (vuejs-jp#383)
  Add created hook to custom directives code example (vuejs-jp#382)
  API Reference > Global API の翻訳を追従 (vuejs-jp#376)
  guide/typescript-support.mdのtypoを修正(肩→型) (vuejs-jp#403)
  ...
  • Loading branch information
naokie committed Jun 19, 2021
2 parents e213d47 + 97b2d16 commit 63b7896
Show file tree
Hide file tree
Showing 61 changed files with 1,092 additions and 273 deletions.
4 changes: 3 additions & 1 deletion src/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ const sidebar = {
children: [
'/cookbook/',
'/cookbook/editable-svg-icons',
// '/cookbook/debugging-in-vscode'
'/cookbook/debugging-in-vscode',
'/cookbook/automatic-global-registration-of-base-components'
]
}
],
Expand Down Expand Up @@ -171,6 +172,7 @@ const sidebar = {
],
migration: [
'/guide/migration/introduction',
'/guide/migration/migration-build',
{
title: '詳細',
collapsable: false,
Expand Down
Binary file added src/.vuepress/public/images/breakpoint_hit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/.vuepress/public/images/breakpoint_set.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/.vuepress/public/images/config_add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/api/composition-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ The component instance context is also set during the synchronous execution of l
- `errorCaptured` -> `onErrorCaptured`
- `renderTracked` -> `onRenderTracked`
- `renderTriggered` -> `onRenderTriggered`
- `activated` -> `onActivated`
- `deactivated` -> `onDeactivated`


- **See also**: [Composition API lifecycle hooks](../guide/composition-api-lifecycle-hooks.html)

Expand Down
Loading

0 comments on commit 63b7896

Please sign in to comment.