Skip to content

Commit 3ed14b9

Browse files
MachinisteWebchrisvfritz
authored andcommitted
[Doc EN]: Line return fix in typescript.md (#1251)
* New in with + symbol Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com> * Review of 2.5.0 doc Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com> * Review Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com> * Correct line return Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com> * Good list number Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com> * fix typo in style-guide/index.md Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>
1 parent 33c0a86 commit 3ed14b9

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/v2/guide/typescript.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ var vm = new Vue({
144144

145145
## Annotating Return Types
146146

147-
Because of the circular nature of Vue's declaration files, TypeScript may have difficulties inferring the types of certain methods.
148-
For this reason, you may need to annotate the return type on methods like `render` and those in `computed`.
147+
Because of the circular nature of Vue's declaration files, TypeScript may have difficulties inferring the types of certain methods. For this reason, you may need to annotate the return type on methods like `render` and those in `computed`.
149148

150149
```ts
151150
import Vue, { VNode } from 'vue'
@@ -175,5 +174,4 @@ const Component = Vue.extend({
175174
})
176175
```
177176

178-
If you find type inference or member completion isn't working, annotating certain methods may help address these problems.
179-
Using the `--noImplicitAny` option will help find many of these unannotated methods.
177+
If you find type inference or member completion isn't working, annotating certain methods may help address these problems. Using the `--noImplicitAny` option will help find many of these unannotated methods.

src/v2/style-guide/index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,34 +1377,34 @@ This is the default order we recommend for component options. They're split into
13771377
2. **List Rendering** (creates multiple variations of the same element)
13781378
- `v-for`
13791379

1380-
2. **Conditionals** (whether the element is rendered/shown)
1380+
3. **Conditionals** (whether the element is rendered/shown)
13811381
- `v-if`
13821382
- `v-else-if`
13831383
- `v-else`
13841384
- `v-show`
13851385
- `v-cloak`
13861386

1387-
3. **Render Modifiers** (changes the way the element renders)
1387+
4. **Render Modifiers** (changes the way the element renders)
13881388
- `v-pre`
13891389
- `v-once`
13901390

1391-
4. **Global Awareness** (requires knowledge beyond the component)
1391+
5. **Global Awareness** (requires knowledge beyond the component)
13921392
- `id`
13931393

1394-
5. **Unique Attributes** (attributes that require unique values)
1394+
6. **Unique Attributes** (attributes that require unique values)
13951395
- `ref`
13961396
- `key`
13971397
- `slot`
13981398

1399-
6. **Two-Way Binding** (combining binding and events)
1399+
7. **Two-Way Binding** (combining binding and events)
14001400
- `v-model`
14011401

1402-
7. **Other Attributes** (all unspecified bound & unbound attributes)
1402+
8. **Other Attributes** (all unspecified bound & unbound attributes)
14031403

1404-
8. **Events** (component event listeners)
1404+
9. **Events** (component event listeners)
14051405
- `v-on`
14061406

1407-
9. **Content** (overrides the content of the element)
1407+
10. **Content** (overrides the content of the element)
14081408
- `v-html`
14091409
- `v-text`
14101410

@@ -1476,7 +1476,7 @@ computed: {
14761476

14771477
### Single-file component top-level element order <sup data-p="c">recommended</sup>
14781478

1479-
**[Single-file components](../guide/single-file-components.html) should always order `template`, `script`, and `style` tags consistently, with `<style>` last, because at least one of the other two is always necessary.**
1479+
**[Single-file components](../guide/single-file-components.html) should always order `<template>`, `<script>`, and `<style>` tags consistently, with `<style>` last, because at least one of the other two is always necessary.**
14801480

14811481
{% raw %}<div class="style-example example-bad">{% endraw %}
14821482
#### Bad

0 commit comments

Comments
 (0)