diff options
| author | Jacob <[email protected]> | 2013-12-26 17:46:59 -0800 |
|---|---|---|
| committer | Jacob <[email protected]> | 2013-12-26 17:46:59 -0800 |
| commit | bea46fca70ec178d2449a9c151de666838317e92 (patch) | |
| tree | fd23594835b822d2db09a353320df7a129c3675d | |
| parent | 0bcc5a2814a19811d3c4dafdf2761250b5f441eb (diff) | |
| parent | 12a3bb31f82b7fee96dbd5d91f4a5bef90c7acd6 (diff) | |
| download | bootstrap-bea46fca70ec178d2449a9c151de666838317e92.tar.xz bootstrap-bea46fca70ec178d2449a9c151de666838317e92.zip | |
Merge pull request #10834 from Prinzhorn/master
Only preventDefault on click on [data-toggle="modal"] when the element is a link
| -rw-r--r-- | js/modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/modal.js b/js/modal.js index fe02d71d4..4ef39e0a5 100644 --- a/js/modal.js +++ b/js/modal.js @@ -218,7 +218,7 @@ var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) - e.preventDefault() + if ($this.is('a')) e.preventDefault() $target .modal(option, this) |