aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorHeinrich Fenkart <[email protected]>2014-10-22 04:28:16 +0200
committerHeinrich Fenkart <[email protected]>2014-10-22 04:28:16 +0200
commit930c422f22182710e84cc1d9cb575c6a759c1074 (patch)
treee92ae82ace42217b5c6cf2091919cccf93e222da /docs/dist/js/bootstrap.js
parente811a2411827ad2da3821b6357c920bc903c3b82 (diff)
downloadbootstrap-930c422f22182710e84cc1d9cb575c6a759c1074.tar.xz
bootstrap-930c422f22182710e84cc1d9cb575c6a759c1074.zip
grunt
Diffstat (limited to 'docs/dist/js/bootstrap.js')
-rw-r--r--docs/dist/js/bootstrap.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js
index f4c1edf5c..a05b9f373 100644
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -552,17 +552,21 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
Collapse.prototype.show = function () {
if (this.transitioning || this.$element.hasClass('in')) return
+ var activesData
+ var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')
+
+ if (actives && actives.length) {
+ activesData = actives.data('bs.collapse')
+ if (activesData && activesData.transitioning) return
+ }
+
var startEvent = $.Event('show.bs.collapse')
this.$element.trigger(startEvent)
if (startEvent.isDefaultPrevented()) return
- var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')
-
if (actives && actives.length) {
- var hasData = actives.data('bs.collapse')
- if (hasData && hasData.transitioning) return
Plugin.call(actives, 'hide')
- hasData || actives.data('bs.collapse', null)
+ activesData || actives.data('bs.collapse', null)
}
var dimension = this.dimension()