diff options
| author | fat <[email protected]> | 2013-07-17 23:52:29 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-17 23:52:29 -0700 |
| commit | b13eecaeec6f27db8d83a8808ed4178033370e05 (patch) | |
| tree | bb5210646e653c053ede2bf82d08dec334cec2bc | |
| parent | 59f847e8eef64c4adbc57a682ad626e068370b30 (diff) | |
| download | bootstrap-b13eecaeec6f27db8d83a8808ed4178033370e05.tar.xz bootstrap-b13eecaeec6f27db8d83a8808ed4178033370e05.zip | |
fixes #7880
| -rw-r--r-- | js/collapse.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/js/collapse.js b/js/collapse.js index 619ccc720..8d4c6afec 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -145,21 +145,22 @@ // ================= $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - var target = $this.attr('data-target') + var $this = $(this), href + var target = $this.attr('data-target') || e.preventDefault() || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - var data = $(target).data('bs.collapse') - var option = data ? 'toggle' : $this.data() - var parent = $this.attr('data-parent') + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') var $parent = parent && $(parent) if (!data || !data.transitioning) { if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } - $(target).collapse(option) + $target.collapse(option) }) }(window.jQuery); |