From: Mark Otto <markdotto@gmail.com>
Date: Sat, 26 Nov 2016 08:58:51 +0000 (-0800)
Subject: Merge branch 'v4-dev-18796' of https://github.com/maxbeatty/bootstrap into maxbeatty... 
X-Git-Tag: v4.0.0-alpha.6~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25d218b02d0c5110bdbf5f61f315ead25fa0b89e;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev-18796' of https://github.com/maxbeatty/bootstrap into maxbeatty-v4-dev-18796
---

25d218b02d0c5110bdbf5f61f315ead25fa0b89e
diff --cc js/src/modal.js
index 5c2c0208aa,fd13a687cb..447e32acfe
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@@ -486,10 -488,10 +486,10 @@@ const Modal = (($) => 
        target = $(selector)[0]
      }
  
 -    let config = $(target).data(DATA_KEY) ?
 +    const config = $(target).data(DATA_KEY) ?
        'toggle' : $.extend({}, $(target).data(), $(this).data())
  
-     if (this.tagName === 'A') {
+     if (this.tagName === 'A' || this.tagName === 'AREA') {
        event.preventDefault()
      }