Skip to content
This repository has been archived by the owner on Jan 17, 2021. It is now read-only.

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
crossjs committed Nov 24, 2016
1 parent adaf7a0 commit 7a191cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"nuo": "^1.0.0",
"query-string": "^4.2.3",
"string-template": "^1.0.0",
"vue": "^2.1.0",
"vue": "^2.1.3",
"vue-router": "^2.0.3",
"vuex": "^2.0.0",
"vuex-actions": "^1.1.1",
Expand Down Expand Up @@ -91,8 +91,9 @@
"url-loader": "^0.5.7",
"vue-hot-reload-api": "^2.0.6",
"vue-html-loader": "^1.2.3",
"vue-loader": "^10.0.0",
"vue-loader": "^10.0.1",
"vue-style-loader": "^1.0.0",
"vue-template-compiler": "^2.1.3",
"webpack": "^2.1.0-beta.27",
"webpack-dev-server": "^2.1.0-beta.11",
"yargs": "^6.4.0"
Expand Down
4 changes: 2 additions & 2 deletions src/components/core/scroller.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ export default {
offset: 0,
// 推拉状态
pullState: STATE_IDLE,
// 溢出距离
maxScroll: 0,
maxHeight: 0
}
},
Expand Down Expand Up @@ -134,6 +132,8 @@ export default {
},
mounted () {
// 溢出距离
this.maxScroll = 0
// 临界阈值
this.threshold = this.$refs.indicator.clientHeight * this.bounce
this.fill()
Expand Down

0 comments on commit 7a191cd

Please # to comment.