]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge remote-tracking branch 'zurb/develop' into abdullahsalem/fix-issue-9823
authorNicolas Coden <nicolas@ncoden.fr>
Sun, 25 Mar 2018 15:51:19 +0000 (17:51 +0200)
committerNicolas Coden <nicolas@ncoden.fr>
Sun, 25 Mar 2018 15:51:19 +0000 (17:51 +0200)
1  2 
js/foundation.dropdownMenu.js

index 5d41f78d27ba434b1270e44a625f10ca3c66aa9d,917ce29b0cfb803a312f443c52eb0f5240ac2c30..b1e89a4163006ef02a696f3de423ed1b7e0441ee
@@@ -271,20 -270,13 +271,16 @@@ class DropdownMenu extends Plugin 
    _addBodyHandler() {
      var $body = $(document.body),
          _this = this;
-     $body.off('touchmove.zf.dropdownmenu')
-          .on('touchmove.zf.dropdownmenu', function(){
-            _this.isTouchMove = true;
-          })
-          .off('mouseup.zf.dropdownmenu touchend.zf.dropdownmenu')
-          .on('mouseup.zf.dropdownmenu touchend.zf.dropdownmenu', function(e) {
+     $body.off('mouseup.zf.dropdownMenu touchend.zf.dropdownMenu')
+          .on('mouseup.zf.dropdownMenu touchend.zf.dropdownMenu', function(e) {
             var $link = _this.$element.find(e.target);
 -           if ($link.length) { return; }
 +           if ($link.length || _this.isTouchMove){
 +             _this.isTouchMove = false;
 +             return;
 +           }
  
             _this._hide();
-            $body.off('mouseup.zf.dropdownmenu touchend.zf.dropdownmenu touchmove.zf.dropdownmenu');
+            $body.off('mouseup.zf.dropdownMenu touchend.zf.dropdownMenu');
           });
    }