From: Max Beatty <max@beatty.me>
Date: Thu, 4 Aug 2016 20:47:30 +0000 (-0700)
Subject: prevent navigating to area href when modal target. fixes #18796
X-Git-Tag: v4.0.0-alpha.6~408^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfa714ae1e91e2f77017d02489cbc39fada032c7;p=thirdparty%2Fbootstrap.git

prevent navigating to area href when modal target. fixes #18796
---

diff --git a/js/src/modal.js b/js/src/modal.js
index 9b3a99ddd7..fd13a687cb 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -491,7 +491,7 @@ const Modal = (($) => {
     let config = $(target).data(DATA_KEY) ?
       'toggle' : $.extend({}, $(target).data(), $(this).data())
 
-    if (this.tagName === 'A') {
+    if (this.tagName === 'A' || this.tagName === 'AREA') {
       event.preventDefault()
     }
 
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 28c1e0ec74..7329776bae 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -403,4 +403,26 @@ $(function () {
       })
       .bootstrapModal('show')
   })
+
+  QUnit.test('should not follow link in area tag', function (assert) {
+    assert.expect(2)
+    var done = assert.async()
+
+    $('<map><area id="test" shape="default" data-toggle="modal" data-target="#modal-test" href="demo.html"/></map>')
+      .appendTo('#qunit-fixture')
+
+    $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"/></div></div>')
+      .appendTo('#qunit-fixture')
+
+    $('#test')
+      .on('click.bs.modal.data-api', function (event) {
+        assert.notOk(event.isDefaultPrevented(), 'navigating to href will happen')
+
+        setTimeout(function () {
+          assert.ok(event.isDefaultPrevented(), 'model shown instead of navigating to href')
+          done()
+        }, 1)
+      })
+      .trigger('click')
+  })
 })