From: Alexander Prinzhorn Date: Fri, 27 Sep 2013 09:32:06 +0000 (+0200) Subject: Only preventDefault on click on [data-toggle="modal"] when the element is a link X-Git-Tag: v3.1.0~136^2~11^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a3bb31f82b7fee96dbd5d91f4a5bef90c7acd6;p=thirdparty%2Fbootstrap.git Only preventDefault on click on [data-toggle="modal"] when the element is a link In it's current state Bootstrap always prevents the default action for a click event on `[data-toggle="modal"]` elements (see https://github.com/twbs/bootstrap/blob/master/js/modal.js#L233). Instead this should only happen when the element is a link. --- diff --git a/js/modal.js b/js/modal.js index 65eba481e5..349431d998 100644 --- a/js/modal.js +++ b/js/modal.js @@ -230,7 +230,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)