Skip to content

[en] http -> https & some typos #1773

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
Sep 29, 2017
Merged
Show file tree
Hide file tree
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 docs/en/advanced/lazy-loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Second, in webpack 2, we can use the [dynamic import](https://github.com/tc39/pr
import('./Foo.vue') // returns a Promise
```

> Note: if you are using Babel, you will need to add the [syntax-dynamic-import](http://babeljs.io/docs/plugins/syntax-dynamic-import/) plugin so that Babel can properly parse the syntax.
> Note: if you are using Babel, you will need to add the [syntax-dynamic-import](https://babeljs.io/docs/plugins/syntax-dynamic-import/) plugin so that Babel can properly parse the syntax.

Combining the two, this is how to define an async component that will be automatically code-split by webpack:

Expand Down
4 changes: 0 additions & 4 deletions docs/en/api/router-link.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<router-link :to="{ path: 'register', query: { plan: 'private' }}">Register</router-link>
```


- **replace**

- type: `boolean`
Expand All @@ -55,7 +54,6 @@
<router-link :to="{ path: '/abc'}" replace></router-link>
```


- **append**

- type: `boolean`
Expand All @@ -68,7 +66,6 @@
<router-link :to="{ path: 'relative/path'}" append></router-link>
```


- **tag**

- type: `string`
Expand All @@ -83,7 +80,6 @@
<li>foo</li>
```


- **active-class**

- type: `string`
Expand Down
2 changes: 1 addition & 1 deletion docs/en/essentials/dynamic-matching.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const User = {
}
```

You can check out a live example [here](http://jsfiddle.net/yyx990803/4xfa2f19/).
You can check out a live example [here](https://jsfiddle.net/yyx990803/4xfa2f19/).

You can have multiple dynamic segments in the same route, and they will map to corresponding fields on `$route.params`. Examples:

Expand Down
2 changes: 1 addition & 1 deletion docs/en/essentials/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ const app = new Vue({
// Now the app has started!
```

You can also check out this example [live](http://jsfiddle.net/yyx990803/xgrjzsup/).
You can also check out this example [live](https://jsfiddle.net/yyx990803/xgrjzsup/).

Notice that a `<router-link>` automatically gets the `.router-link-active` class when its target route is matched. You can learn more about it in its [API reference](../api/router-link.md).
3 changes: 1 addition & 2 deletions docs/en/essentials/navigation.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The same rules apply for the `to` property of the `router-link` component.

In 2.2.0+, optionally provide `onComplete` and `onAbort` callbacks to `router.push` or `router.replace` as the 2nd and 3rd arguments. These callbacks will be called when the navigation either successfully completed (after all async hooks are resolved), or aborted (navigated to the same route, or to a different route before current navigation has finished), respectively.

**Note:** If the destination is the same as the current route and only params are changing (eg: going from one profile to another `/users/1` -> `/users/2`), you will have to use [beforeRouteUpdate](./dynamic-matching.html#reacting-to-params-changes) to react to changes (eg: fetching the user information).
**Note:** If the destination is the same as the current route and only params are changing (e.g. going from one profile to another `/users/1` -> `/users/2`), you will have to use [`beforeRouteUpdate`](./dynamic-matching.html#reacting-to-params-changes) to react to changes (e.g. fetching the user information).

#### `router.replace(location, onComplete?, onAbort?)`

Expand All @@ -54,7 +54,6 @@ It acts like `router.push`, the only difference is that it navigates without pus
|-------------|--------------|
| `<router-link :to="..." replace>` | `router.replace(...)` |


#### `router.go(n)`

This method takes a single integer as parameter that indicates by how many steps to go forwards or go backwards in the history stack, similar to `window.history.go(n)`.
Expand Down
2 changes: 1 addition & 1 deletion docs/en/essentials/nested-routes.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ const router = new VueRouter({
})
```

A working demo of this example can be found [here](http://jsfiddle.net/yyx990803/L7hscd8h/).
A working demo of this example can be found [here](https://jsfiddle.net/yyx990803/L7hscd8h/).