Merge pull request #12 from progrape/master

#10 修复页面内的元素无法触发`click`事件的bug
wechatui · Dec 7, 2015 · f0c048e · f0c048e
2 parents 2d8b153 + f61cb77
commit f0c048e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 31 deletions.
diff --git a/dist/swiper.css b/dist/swiper.css
@@ -1,6 +1,6 @@
 /**
- * swiper - swiper.js
- * @version v1.4.0
+ * iswiper - swiper.js
+ * @version v1.4.1
  * @link https://github.com/weui/swiper.git
  * @license MIT
  */

diff --git a/dist/swiper.js b/dist/swiper.js
@@ -1,6 +1,6 @@
 /**
- * swiper - swiper.js
- * @version v1.4.0
+ * iswiper - swiper.js
+ * @version v1.4.1
  * @link https://github.com/weui/swiper.git
  * @license MIT
  */
@@ -19,7 +19,7 @@
      * @constructor
      */
     function Swiper(options) {
-        this.version = '1.4.0';
+        this.version = '1.4.1';
         this._default = {container: '.swiper', item: '.item', direction: 'vertical', activeClass: 'active', threshold: 50, duration: 300};
         this._options = extend(this._default, options);
         this._start = {};
@@ -124,7 +124,6 @@
 
             me._show(me._current);
 
-            e.preventDefault();
         }, false);
 
         this.$container.addEventListener('transitionEnd', function (e) {

diff --git a/dist/swiper.min.css b/dist/swiper.min.css
@@ -1,6 +1,6 @@
 /**
- * swiper - swiper.js
- * @version v1.4.0
+ * iswiper - swiper.js
+ * @version v1.4.1
  * @link https://github.com/weui/swiper.git
  * @license MIT
  */

diff --git a/dist/swiper.min.js b/dist/swiper.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "swiper",
-  "version": "1.4.0",
+  "name": "iswiper",
+  "version": "1.4.1",
   "description": "swiper.js",
   "author": "wechat ui team",
   "scripts": {

diff --git a/src/swiper.js b/src/swiper.js
@@ -118,7 +118,6 @@
 
             me._show(me._current);
 
-            e.preventDefault();
         }, false);
 
         this.$container.addEventListener('transitionEnd', function (e) {

diff --git a/test/test.js b/test/test.js
@@ -63,23 +63,6 @@ describe('swiper should have the following properties', function(){
     }
 });
 
-describe('it should add classes to dom', function(){
-    var $slider = swiper.$items[swiper._current];
-    var $items = $slider.querySelectorAll('*[toggle-class]');
-    Array.prototype.forEach.call($items, function($item, index){
-        var clazz = $item.getAttribute('toggle-class').split(/\s+/);
-        for(var i = 0, len = clazz.length; i < len; i++){
-            (function(i){
-                it('.' + clazz, function(done){
-                    setTimeout(function(){
-                        assert($item.className.indexOf(clazz[i]) !== -1);
-                        done();
-                    }, 1000);
-                });
-            })(i);
-        }
-    });
-});
 
 describe('.next()', function (){
     it('should translateY the container to the slide height & should add classes to dom', function (){
@@ -96,6 +79,20 @@ describe('.next()', function (){
     });
 });
 
+describe('.go()', function (){
+    it('should translateY the container to the slide height & should add classes to dom', function (){
+        swiper.go(0);
+        for(var i = 1, len = swiper.$items.length; i < len; i++){
+            swiper.go(i);
+            var height = swiper.$items[i].style['height'].replace('px', '');
+            var expect = 'translate3d(0px, -'+ (height * i) +'px, 0px)';
+
+            assert(swiper._current === i);
+            assert(swiper.$container.style['-webkit-transform'] === expect);
+        }
+    });
+});
+
 describe('.on()', function (){
     it('swiped listener should not be empty', function (){