diff options
| author | Gleb Mazovetskiy <glebm@google.com> | 2015-03-07 21:58:03 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glebm@google.com> | 2015-03-16 18:38:18 +0300 |
| commit | e0ddfcdf288c23bd97b8511a290db7291ccf1860 (patch) | |
| tree | 5edf3199c6de2c42317084290b19b6cac1ddbe89 /assets/javascripts/bootstrap/collapse.js | |
| parent | 606c0f083b6b316ffb75be2fd27107a43f822d7b (diff) | |
rake convert
Diffstat (limited to 'assets/javascripts/bootstrap/collapse.js')
| -rw-r--r-- | assets/javascripts/bootstrap/collapse.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js index 2bc30e7..834f4f6 100644 --- a/assets/javascripts/bootstrap/collapse.js +++ b/assets/javascripts/bootstrap/collapse.js @@ -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) { @@ -33,8 +34,7 @@ Collapse.TRANSITION_DURATION = 350 Collapse.DEFAULTS = { - toggle: true, - trigger: '[data-toggle="collapse"]' + toggle: true } Collapse.prototype.dimension = function () { @@ -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) }) |