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.js14
1 files changed, 7 insertions, 7 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 2bc30e7b..954513c5 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.3.2
+ * Bootstrap: collapse.js v3.3.4
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -16,7 +16,8 @@
var Collapse = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, Collapse.DEFAULTS, options)
- this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
+ this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
+ '[data-toggle="collapse"][data-target="#' + element.id + '"]')
this.transitioning = null
if (this.options.parent) {
@@ -28,13 +29,12 @@
if (this.options.toggle) this.toggle()
}
- Collapse.VERSION = '3.3.2'
+ Collapse.VERSION = '3.3.4'
Collapse.TRANSITION_DURATION = 350
Collapse.DEFAULTS = {
- toggle: true,
- trigger: '[data-toggle="collapse"]'
+ toggle: true
}
Collapse.prototype.dimension = function () {
@@ -172,7 +172,7 @@
var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
- if (!data && options.toggle && option == 'show') options.toggle = false
+ if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})
@@ -203,7 +203,7 @@
var $target = getTargetFromTrigger($this)
var data = $target.data('bs.collapse')
- var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
+ var option = data ? 'toggle' : $this.data()
Plugin.call($target, option)
})