From f06a91fe591aa68e361e05211874594fc2e5f174 Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Fri, 29 May 2020 22:15:19 +0900 Subject: [PATCH 01/20] docs(ja): update NOTE: https://github.com/vuejs/vue-router/commit/fdf5756f15fddf15c18e0269c31f1ca868f6a50d --- docs/ja/guide/advanced/navigation-guards.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ja/guide/advanced/navigation-guards.md b/docs/ja/guide/advanced/navigation-guards.md index 13add0f21..6403f018b 100644 --- a/docs/ja/guide/advanced/navigation-guards.md +++ b/docs/ja/guide/advanced/navigation-guards.md @@ -140,7 +140,7 @@ beforeRouteLeave (to, from, next) { ## 完全なナビゲーション解決フロー 1. ナビゲーションがトリガされる -2. 非アクティブ化されたコンポーネントで leave ガードを呼ぶ +2. 非アクティブ化されたコンポーネントで `beforeRouteLeave` ガードを呼ぶ 3. グローバル `beforeEach` ガードを呼ぶ 4. 再利用されるコンポーネントで `beforeRouteUpdate` ガードを呼ぶ (2.2 以降) 5. ルート設定内の `beforeEnter` を呼ぶ From 9ff4d63d3e8ee1a70ad45c1393ec9ce8b3a9f414 Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Fri, 29 May 2020 22:22:35 +0900 Subject: [PATCH 02/20] docs(ja): pick NOTE: https://github.com/vuejs/vue-router/commit/a55ae44f72099395c42af18acf93e131ec1ee560 --- docs/ja/guide/advanced/data-fetching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ja/guide/advanced/data-fetching.md b/docs/ja/guide/advanced/data-fetching.md index 22244af65..d4768d6bd 100644 --- a/docs/ja/guide/advanced/data-fetching.md +++ b/docs/ja/guide/advanced/data-fetching.md @@ -17,7 +17,7 @@ ``` html