summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
diff options
context:
space:
mode:
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js')
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
index b2cc1253..2bc30e7b 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.3.1
+ * Bootstrap: collapse.js v3.3.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -28,7 +28,7 @@
if (this.options.toggle) this.toggle()
}
- Collapse.VERSION = '3.3.1'
+ Collapse.VERSION = '3.3.2'
Collapse.TRANSITION_DURATION = 350
@@ -46,7 +46,7 @@
if (this.transitioning || this.$element.hasClass('in')) return
var activesData
- var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')
+ var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
if (actives && actives.length) {
activesData = actives.data('bs.collapse')