Skip to content

Commit 4625b74

Browse files
committed
Merge branch 'rivajunior-fix/item-mode-loop'
2 parents 3436639 + 37618b7 commit 4625b74

29 files changed

+2559
-3208
lines changed

.eslintrc.json

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"extends": [
3-
"standard",
4-
"plugin:vue/recommended"
5-
],
2+
"extends": ["standard", "plugin:vue/recommended"],
63
"env": {
74
"browser": true,
85
"amd": true
@@ -13,24 +10,31 @@
1310
"describe": "readonly"
1411
},
1512
"parserOptions": {
16-
"ecmaVersion": 5,
13+
"ecmaVersion": 6,
1714
"sourceType": "module"
1815
},
1916
"rules": {
2017
"arrow-parens": 0,
2118
"generator-star-spacing": 0,
22-
"no-trailing-spaces": [ 0, { "skipBlankLines": true } ],
23-
"vue/html-indent": ["error", 2, {
24-
"baseIndent": 0,
25-
"alignAttributesVertically": false
26-
}],
19+
"no-trailing-spaces": [0, { "skipBlankLines": true }],
20+
"vue/html-indent": [
21+
"error",
22+
2,
23+
{
24+
"baseIndent": 0,
25+
"alignAttributesVertically": false
26+
}
27+
],
2728
"vue/script-indent": ["error", 2],
28-
"vue/max-attributes-per-line": ["error", {
29-
"singleline": 10,
30-
"multiline": {
31-
"max": 10,
32-
"allowFirstLine": true
29+
"vue/max-attributes-per-line": [
30+
"error",
31+
{
32+
"singleline": 10,
33+
"multiline": {
34+
"max": 10,
35+
"allowFirstLine": true
36+
}
3337
}
34-
}]
38+
]
3539
}
3640
}

demos/common/Corner.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default {
2929
3030
computed: {
3131
url () {
32-
return `https://github.com/tangbc/vue-virtual-scroll-list/tree/master/demos` + (this.path || '')
32+
return 'https://github.com/tangbc/vue-virtual-scroll-list/tree/master/demos' + (this.path || '')
3333
}
3434
}
3535
}

demos/common/Item.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default {
6262
computed: {
6363
itemStyle () {
6464
return {
65-
'height': `${this.height}px`,
65+
height: `${this.height}px`,
6666
'line-height': `${this.height}px`
6767
}
6868
}

demos/common/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ const skinColorArr = [
159159

160160
export const getRandomAvatar = () => {
161161
return 'https://avataaars.io/?' + [
162-
`avatarStyle=Transparent`,
162+
'avatarStyle=Transparent',
163163
`topType=${Random.pick(topTypeArr)}`,
164164
`accessoriesType=${Random.pick(accessoriesTypeArr)}`,
165165
`hatColor=${Random.pick(facialHairTypeArr)}`,

demos/item-mode/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const remain = 6
3232
const itemSize = 80
3333
const itemCount = countStorage.get()
3434
35-
let userInfoList = []
35+
const userInfoList = []
3636
for (let i = 0; i < itemCount; i++) {
3737
userInfoList.push(getRandomUser())
3838
}

demos/item-mode/build.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/page-mode/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const remain = 17
3131
const itemSize = 80
3232
const itemCount = countStorage.get()
3333
34-
let userInfoList = []
34+
const userInfoList = []
3535
for (let i = 0; i < itemCount; i++) {
3636
userInfoList.push(getRandomUser())
3737
}

demos/page-mode/build.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/scroll-element/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const remain = 14
3333
const itemSize = 80
3434
const itemCount = countStorage.get()
3535
36-
let userInfoList = []
36+
const userInfoList = []
3737
for (let i = 0; i < itemCount; i++) {
3838
userInfoList.push(getRandomUser())
3939
}

demos/scroll-element/build.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)