Merge pull request #192 from xieyu33333/develop

Develop
be-fe · Mar 16, 2015 · 30d6c05 · 30d6c05
2 parents 4a14dff + 0996106
commit 30d6c05
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 1 deletion.
diff --git a/build/islider.js b/build/islider.js
@@ -514,6 +514,19 @@ iSlider = function () {
     var res = this._endHandler ? this._endHandler(evt) : false;
     var absOffset = Math.abs(offset[axis]);
     var absReverseOffset = Math.abs(offset[this.reverseAxis]);
+    var getLink = function (el) {
+      console.log(el);
+      if (el.tagName === 'A') {
+        if (el.href) {
+          window.location.href = el.href;
+          return false;
+        }
+      } else if (el.className === 'islider-dom') {
+        return false;
+      } else {
+        getLink(el.parentNode);
+      }
+    };
     if (!res && offset[axis] >= boundary && absReverseOffset < absOffset) {
       this.slideTo(this.slideIndex - 1);
     } else if (!res && offset[axis] < -boundary && absReverseOffset < absOffset) {
@@ -525,6 +538,7 @@ iSlider = function () {
     if (Math.abs(this.offset.X) < 10 && Math.abs(this.offset.Y) < 10) {
       this.tapEvt = document.createEvent('Event');
       this.tapEvt.initEvent('tap', true, true);
+      getLink(evt.target);
       if (!evt.target.dispatchEvent(this.tapEvt)) {
         evt.preventDefault();
       }

diff --git a/build/islider_core.js b/build/islider_core.js
@@ -514,6 +514,19 @@ iSlider = function () {
     var res = this._endHandler ? this._endHandler(evt) : false;
     var absOffset = Math.abs(offset[axis]);
     var absReverseOffset = Math.abs(offset[this.reverseAxis]);
+    var getLink = function (el) {
+      console.log(el);
+      if (el.tagName === 'A') {
+        if (el.href) {
+          window.location.href = el.href;
+          return false;
+        }
+      } else if (el.className === 'islider-dom') {
+        return false;
+      } else {
+        getLink(el.parentNode);
+      }
+    };
     if (!res && offset[axis] >= boundary && absReverseOffset < absOffset) {
       this.slideTo(this.slideIndex - 1);
     } else if (!res && offset[axis] < -boundary && absReverseOffset < absOffset) {
@@ -525,6 +538,7 @@ iSlider = function () {
     if (Math.abs(this.offset.X) < 10 && Math.abs(this.offset.Y) < 10) {
       this.tapEvt = document.createEvent('Event');
       this.tapEvt.initEvent('tap', true, true);
+      getLink(evt.target);
       if (!evt.target.dispatchEvent(this.tapEvt)) {
         evt.preventDefault();
       }

diff --git a/demo/public/js/islider.js b/demo/public/js/islider.js
@@ -514,6 +514,19 @@ iSlider = function () {
     var res = this._endHandler ? this._endHandler(evt) : false;
     var absOffset = Math.abs(offset[axis]);
     var absReverseOffset = Math.abs(offset[this.reverseAxis]);
+    var getLink = function (el) {
+      console.log(el);
+      if (el.tagName === 'A') {
+        if (el.href) {
+          window.location.href = el.href;
+          return false;
+        }
+      } else if (el.className === 'islider-dom') {
+        return false;
+      } else {
+        getLink(el.parentNode);
+      }
+    };
     if (!res && offset[axis] >= boundary && absReverseOffset < absOffset) {
       this.slideTo(this.slideIndex - 1);
     } else if (!res && offset[axis] < -boundary && absReverseOffset < absOffset) {
@@ -525,6 +538,7 @@ iSlider = function () {
     if (Math.abs(this.offset.X) < 10 && Math.abs(this.offset.Y) < 10) {
       this.tapEvt = document.createEvent('Event');
       this.tapEvt.initEvent('tap', true, true);
+      getLink(evt.target);
       if (!evt.target.dispatchEvent(this.tapEvt)) {
         evt.preventDefault();
       }

diff --git a/demo/public/js/islider_core.js b/demo/public/js/islider_core.js
@@ -514,6 +514,19 @@ iSlider = function () {
     var res = this._endHandler ? this._endHandler(evt) : false;
     var absOffset = Math.abs(offset[axis]);
     var absReverseOffset = Math.abs(offset[this.reverseAxis]);
+    var getLink = function (el) {
+      console.log(el);
+      if (el.tagName === 'A') {
+        if (el.href) {
+          window.location.href = el.href;
+          return false;
+        }
+      } else if (el.className === 'islider-dom') {
+        return false;
+      } else {
+        getLink(el.parentNode);
+      }
+    };
     if (!res && offset[axis] >= boundary && absReverseOffset < absOffset) {
       this.slideTo(this.slideIndex - 1);
     } else if (!res && offset[axis] < -boundary && absReverseOffset < absOffset) {
@@ -525,6 +538,7 @@ iSlider = function () {
     if (Math.abs(this.offset.X) < 10 && Math.abs(this.offset.Y) < 10) {
       this.tapEvt = document.createEvent('Event');
       this.tapEvt.initEvent('tap', true, true);
+      getLink(evt.target);
       if (!evt.target.dispatchEvent(this.tapEvt)) {
         evt.preventDefault();
       }

diff --git a/src/islider_core.js b/src/islider_core.js
@@ -577,6 +577,22 @@ define('iSlider', [], function () {
         var absOffset = Math.abs(offset[axis]);
         var absReverseOffset = Math.abs(offset[this.reverseAxis]);
 
+        var getLink = function(el) {
+            console.log(el);
+            if (el.tagName === 'A') {
+                if (el.href) {
+                    window.location.href = el.href
+                    return false;
+                }
+            }
+            else if (el.className === 'islider-dom') {
+                return false;
+            }
+            else {
+                getLink(el.parentNode);
+            }
+        }
+
         if (!res && offset[axis] >= boundary && absReverseOffset < absOffset) {
             this.slideTo(this.slideIndex - 1);
         } else if (!res && offset[axis] < -boundary && absReverseOffset < absOffset) {
@@ -589,7 +605,7 @@ define('iSlider', [], function () {
         if (Math.abs(this.offset.X) < 10 && Math.abs(this.offset.Y) < 10) {
             this.tapEvt = document.createEvent('Event');
             this.tapEvt.initEvent('tap', true, true);
-
+            getLink(evt.target);
             if (!evt.target.dispatchEvent(this.tapEvt)) {
                 evt.preventDefault();
             }