diff options
| author | XhmikosR <[email protected]> | 2015-03-01 21:15:22 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2015-03-02 11:16:06 +0200 |
| commit | ea3c7028bd7ce451a9878ba5dd575b90e949de42 (patch) | |
| tree | f05255f8f353aaf371953fefb6882dd0750c3e00 /docs/dist/js/bootstrap.js | |
| parent | c80872235faaeaf1e8029665fb7674c2e1ba1d8c (diff) | |
| download | bootstrap-ea3c7028bd7ce451a9878ba5dd575b90e949de42.tar.xz bootstrap-ea3c7028bd7ce451a9878ba5dd575b90e949de42.zip | |
Run `grunt`.
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 65833d5e5..267c24880 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -544,7 +544,8 @@ if (typeof jQuery === 'undefined') { 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) { @@ -561,8 +562,7 @@ if (typeof jQuery === 'undefined') { Collapse.TRANSITION_DURATION = 350 Collapse.DEFAULTS = { - toggle: true, - trigger: '[data-toggle="collapse"]' + toggle: true } Collapse.prototype.dimension = function () { @@ -731,7 +731,7 @@ if (typeof jQuery === 'undefined') { 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) }) @@ -1916,7 +1916,7 @@ if (typeof jQuery === 'undefined') { for (i = offsets.length; i--;) { activeTarget != targets[i] && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && (offsets[i + 1] === undefined || scrollTop <= offsets[i + 1]) && this.activate(targets[i]) } } |
