diff options
| author | fat <[email protected]> | 2013-08-02 15:10:47 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-08-02 15:10:47 -0700 |
| commit | e969d2ff18214c8d3b2730155d933c0acd614344 (patch) | |
| tree | b529f68e63c0b6e98003ec9f9d5d771de500011b /js/collapse.js | |
| parent | 69f99201327662ec1bd0e15516a064e6dcc9236c (diff) | |
| parent | 173dac4e54281312ebb7ff993df20caffbc56840 (diff) | |
| download | bootstrap-e969d2ff18214c8d3b2730155d933c0acd614344.tar.xz bootstrap-e969d2ff18214c8d3b2730155d933c0acd614344.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/collapse.js')
| -rw-r--r-- | js/collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/collapse.js b/js/collapse.js index 34ac3c7fa..ab575515d 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('> .accordion-group > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') |