Skip to content

Commit

Permalink
[merge] Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
jin5354 committed Oct 20, 2017
2 parents d7ff041 + ed3135e commit 5db8c1c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ npm-debug.log
yarn-error.log
yarn.lock
stats.json
.history
2 changes: 1 addition & 1 deletion lib/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/picker.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wdui",
"version": "0.6.12",
"version": "0.6.13",
"description": "Mobile UI Components Library based on Vue 2.0",
"main": "lib/index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/Picker/src/PickerSlot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ export default {
}else if (Index > (this.values.length - 1)) {
Index = this.values.length - 1
}
translateUtils.translateElement(this.$el, null, this.itemHeight * (((this.showItemCount - 1) / 2) - Index))
if(Index === this.currentIndex) {
return
}
this.currentIndex = Index
translateUtils.translateElement(this.$el, null, this.itemHeight * (((this.showItemCount - 1) / 2) - Index))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if (typeof window !== 'undefined' && window.Vue) {
install(window.Vue)
}

const version = '0.6.12'
const version = '0.6.13'

export {
install,
Expand Down

0 comments on commit 5db8c1c

Please sign in to comment.