From 85597e8b794cac5f3e92323c981c9b79c04dc7ad Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Thu, 7 Mar 2019 11:41:05 +0100 Subject: [PATCH] Remove duplicate swipe event --- js/foundation.orbit.js | 8 -------- test/javascript/components/orbit.js | 24 ++++++++---------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/js/foundation.orbit.js b/js/foundation.orbit.js index 233a685d5..730f68c26 100644 --- a/js/foundation.orbit.js +++ b/js/foundation.orbit.js @@ -200,14 +200,6 @@ class Orbit extends Plugin { }).on('swiperight.zf.orbit', function(e){ e.preventDefault(); _this.changeSlide(false); - }).on('swipe.zf.orbit', function(e, dir){ - if(dir === 'left') { - e.preventDefault(); - _this.changeSlide(true); - } else if (dir === 'right') { - e.preventDefault(); - _this.changeSlide(false); - } }); } //*************************************** diff --git a/test/javascript/components/orbit.js b/test/javascript/components/orbit.js index 050942a58..151c634f4 100644 --- a/test/javascript/components/orbit.js +++ b/test/javascript/components/orbit.js @@ -200,24 +200,16 @@ describe('Orbit', function() { $html.find('.orbit-slide').eq(0).should.be.hidden; $html.find('.orbit-slide').eq(2).should.be.visible; }); - it('changes slides on swipe with data left', function() { + /*it('changes slides on swipeleft (touchmove)', function() { $html = $(template).appendTo('body'); plugin = new Foundation.Orbit($html, {}); - $html.find('.orbit-slide').eq(0).trigger('swipe', 'left'); - - $html.find('.orbit-slide').eq(0).should.be.hidden; - $html.find('.orbit-slide').eq(1).should.be.visible; - }); - it('changes slides on swipe with data right', function() { - $html = $(template).appendTo('body'); - plugin = new Foundation.Orbit($html, {}); - - $html.find('.orbit-slide').eq(0).trigger('swipe', 'right'); - - $html.find('.orbit-slide').eq(0).should.be.hidden; - $html.find('.orbit-slide').eq(3).should.be.visible; - }); + $html.find('.orbit-slide').eq(0).trigger($.Event("touchstart", {"touches": [{"pageX": 200, "pageY": 10}]})); + $html.find('.orbit-slide').eq(0).trigger($.Event("touchmove", {"touches": [{"pageX": 100, "pageY": 10}]})); + $html.find('.orbit-slide').eq(0).trigger($.Event("touchend", {"touches": [{"pageX": 0, "pageY": 10}]})); + $html.find('.orbit-slide').eq(0).should.be.visible; + $html.find('.orbit-slide').eq(1).should.be.hidden; + });*/ it('changes slides on swipeleft', function() { $html = $(template).appendTo('body'); plugin = new Foundation.Orbit($html, {}); @@ -234,7 +226,7 @@ describe('Orbit', function() { $html.find('.orbit-slide').eq(0).trigger('swiperight'); $html.find('.orbit-slide').eq(0).should.be.hidden; - $html.find('.orbit-slide').eq(3).should.be.visible; + $html.find('.orbit-slide').eq(-1).should.be.visible; }); it('changes slides to the previous one', function() { $html = $(template).appendTo('body'); -- 2.47.2