mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 03:41:19 +02:00
Code Issues Releases Wiki Activity

grunt

Browse Source
This commit is contained in:
Heinrich Fenkart
2014-09-13 02:42:18 +02:00
parent a97db64881
commit 0cf94b82ee
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/js/bootstrap.js vendored
View File

@@ -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] })

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long