diff options
| author | Mark Otto <[email protected]> | 2013-08-16 00:36:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-16 00:36:46 -0700 |
| commit | afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a (patch) | |
| tree | f1e15a8e540f2b3fece2dc6cd817b49a3a76a98f /js/collapse.js | |
| parent | afef74d03d393863048f7374a1ff9e0c4ad93bbb (diff) | |
| parent | 2fa0975956f646be627aaa4732527f6de5335a2c (diff) | |
| download | bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.tar.xz bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Diffstat (limited to 'js/collapse.js')
| -rw-r--r-- | js/collapse.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/collapse.js b/js/collapse.js index 34ac3c7fa..92cc0bc76 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -48,7 +48,7 @@ this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var actives = this.$parent && this.$parent.find('> .panel > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') @@ -169,7 +169,7 @@ var $parent = parent && $(parent) if (!data || !data.transitioning) { - if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } |