sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-06-02 00:01:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10834 from Prinzhorn/master

Browse Source 
Only preventDefault on click on [data-toggle="modal"] when the element is a link
This commit is contained in:
Jacob 2013-12-26 17:46:59 -08:00
commit bea46fca70
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/modal.js
View File

@ -218,7 +218,7 @@
var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 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()) var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
e.preventDefault() if ($this.is('a')) e.preventDefault()
$target $target
.modal(option, this) .modal(option, this)