Commit 56e220e84dd8a1ca35c484d184c419a31d9d8321
Merge branch 'branch_dev'
Showing
1 changed file
with
2 additions
and
3 deletions
js/index.js
| @@ -134,7 +134,6 @@ $(document).on('click','#box li',function () { | @@ -134,7 +134,6 @@ $(document).on('click','#box li',function () { | ||
| 134 | }) | 134 | }) |
| 135 | 135 | ||
| 136 | 136 | ||
| 137 | - | ||
| 138 | var tabsSwiper = new Swiper('.swiper-container',{ | 137 | var tabsSwiper = new Swiper('.swiper-container',{ |
| 139 | autoplay:false, | 138 | autoplay:false, |
| 140 | speed:1000, | 139 | speed:1000, |
| @@ -143,8 +142,8 @@ var tabsSwiper = new Swiper('.swiper-container',{ | @@ -143,8 +142,8 @@ var tabsSwiper = new Swiper('.swiper-container',{ | ||
| 143 | $("#controls li").on('touchstart mousedown',function(e){ | 142 | $("#controls li").on('touchstart mousedown',function(e){ |
| 144 | var that=$(this); | 143 | var that=$(this); |
| 145 | // e.preventDefault() | 144 | // e.preventDefault() |
| 146 | - // $(".tabs .active").removeClass('active') | ||
| 147 | - // $(this).addClass('active') | 145 | + $("#controls li").removeClass('active') |
| 146 | + $(this).addClass('active') | ||
| 148 | tabsSwiper.slideTo( that.index() ) | 147 | tabsSwiper.slideTo( that.index() ) |
| 149 | }) | 148 | }) |
| 150 | 149 |