diff options
| author | Heinrich Fenkart <[email protected]> | 2014-09-13 02:42:18 +0200 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-09-13 02:42:18 +0200 |
| commit | 0cf94b82ee49aa1b2f65495f87945ad3af51354f (patch) | |
| tree | 3dcaf07142acc95485ddc9075b7bc472cf8f5569 /docs/dist/js/bootstrap.js | |
| parent | a97db648817356623961f2d4aeb2bbfb80f5be37 (diff) | |
| download | bootstrap-0cf94b82ee49aa1b2f65495f87945ad3af51354f.tar.xz bootstrap-0cf94b82ee49aa1b2f65495f87945ad3af51354f.zip | |
grunt
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 4372bbe6b..0cb9cb019 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -553,7 +553,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .panel > .in') + var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing') if (actives && actives.length) { var hasData = actives.data('bs.collapse') @@ -1785,6 +1785,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re return ($href && $href.length && $href.is(':visible') + && $el.is(':visible') && [[$href[offsetMethod]().top + offsetBase, href]]) || null }) .sort(function (a, b) { return a[0] - b[0] }) |