Skip to content
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

Swiper: Fix click to fail when only two swiper-item and loop #1484 #1499

Merged
merged 1 commit into from
May 31, 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
5 changes: 5 additions & 0 deletions src/components/swiper/metas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ props:
en: index value, use `v-model` for binding
zh-CN: index 绑定,使用`v-model`,一般不需要绑定
changes:
next:
en:
- '[fix] Fix click to fail when only two swiper-item and loop #1484 @unclay'
zh-CN:
- '[fix] 修复只有两个轮播图且为 loop 时点击失效问题 #1484 @unclay'
v2.2.1-rc.2:
en:
- '[enhance] Use document width as swiper width if initial width is 0 #1188'
Expand Down
18 changes: 0 additions & 18 deletions src/components/swiper/swiper.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ class Swiper {
}

_init () {
if (this._options.loop) {
this._loopTwoItems()
}
this._height = this._options.height === 'auto' ? 'auto' : this._options.height - 0
this.updateItemWidth()
this._initPosition()
Expand Down Expand Up @@ -204,21 +201,6 @@ class Swiper {
me.$items[1] && me.$items[1].addEventListener('webkitTransitionEnd', me.transitionEndHandler, false)
}

_loopTwoItems () {
// issue #596 (support when onlt two)
if (this.count === 2) {
let div = document.createElement('div')
let $item
for (let i = this.$items.length - 1; i >= 0; i--) {
div.innerHTML = this.$items[i].outerHTML
$item = div.querySelector(this._options.item)
$item.classList.add(`${this._options.item.replace('.', '')}-clone`)
this.$container.appendChild($item)
}
this.realCount = 4
}
}

_loopRender () {
const me = this
if (me._loop()) {
Expand Down
17 changes: 16 additions & 1 deletion src/components/swiper/swiper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
<p class="vux-swiper-desc" v-if="showDescMask">{{item.title}}</p>
</a>
</div>
<div v-if="listTwoLoopItem.length > 0" class="vux-swiper-item vux-swiper-item-clone" v-for="(item, index) in listTwoLoopItem" @click="clickListItem(item)" :data-index="index">
<a href="javascript:">
<div class="vux-img" :style="{backgroundImage: buildBackgroundUrl(item.img)}"></div>
<p class="vux-swiper-desc" v-if="showDescMask">{{item.title}}</p>
</a>
</div>
</div>
<div :class="[dotsClass, 'vux-indicator', 'vux-indicator-' + dotsPosition]" v-show="showDots">
<a href="javascript:" v-for="key in length">
Expand All @@ -29,6 +35,7 @@ export default {
}
},
mounted () {
this.hasTwoLoopItem()
this.$nextTick(() => {
if (!(this.list && this.list.length === 0)) {
this.render(this.index)
Expand All @@ -37,6 +44,11 @@ export default {
})
},
methods: {
hasTwoLoopItem () {
if (this.list.length === 2 && this.loop) {
this.listTwoLoopItem = this.list
}
},
clickListItem (item) {
go(item.url, this.$router)
this.$emit('on-click-list-item', JSON.parse(JSON.stringify(item)))
Expand Down Expand Up @@ -70,6 +82,7 @@ export default {
if (!this.$el) {
return
}
this.hasTwoLoopItem()
this.$nextTick(() => {
this.index = this.value || 0
this.current = this.value || 0
Expand Down Expand Up @@ -153,7 +166,9 @@ export default {
current: this.index || 0,
xheight: 'auto',
length: this.list.length,
index: 0
index: 0,
// issue #1484 Fix click to fail
listTwoLoopItem: []
}
},
watch: {
Expand Down
9 changes: 6 additions & 3 deletions src/demos/Swiper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<swiper loop auto :list="demo06_list" :index="demo06_index" @on-index-change="demo06_onIndexChange"></swiper>
<p>current index: {{demo06_index}}</p>

<group-title>循环模式(只有两个)</group-title>
<group-title>循环模式(只有两个且可点击)</group-title>
<swiper loop auto :list="demo07_list" :index="demo07_index" @on-index-change="demo07_onIndexChange"></swiper>
<p>current index: {{demo07_index}}</p>
</div>
Expand Down Expand Up @@ -138,7 +138,10 @@ const demoList = imgList.map((one, index) => ({
img: one
}))

const only2List = baseList.slice(0, 2)
const only2ClickList = baseList.slice(0, 2).map(item => {
item.url = 'http://m.baidu.com'
return item
})

export default {
components: {
Expand Down Expand Up @@ -179,7 +182,7 @@ export default {
demo04_list: imgList,
demo05_list: [],
demo06_list: urlList,
demo07_list: only2List,
demo07_list: only2ClickList,
demo01_index: 0,
demo02_index: 1,
demo05_index: 0,
Expand Down