Skip to content

B
bootstrap
Commit 4d96e69a authored by fat's avatar fat
Browse files
Options

fixes #9836

parent 90eb5249
Expand all Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
dist/js/bootstrap.js
View file @ 4d96e69a
...@@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element this.$element
.removeClass('collapsing') .removeClass('collapsing')
.addClass('collapse in') .addClass('collapse in')
...@@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0 this.transitioning = 0
this.$element this.$element
.trigger('hidden.bs.collapse') .trigger('hidden.bs.collapse')
......
dist/js/bootstrap.min.js
View file @ 4d96e69a
This diff is collapsed.
docs/assets/js/raw-files.min.js
View file @ 4d96e69a
This diff is collapsed.
docs/dist/js/bootstrap.min.js
View file @ 4d96e69a
This diff is collapsed.
js/collapse.js
View file @ 4d96e69a
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element this.$element
.removeClass('collapsing') .removeClass('collapsing')
.addClass('collapse in') .addClass('collapse in')
...@@ -95,7 +96,8 @@ ...@@ -95,7 +96,8 @@
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0 this.transitioning = 0
this.$element this.$element
.trigger('hidden.bs.collapse') .trigger('hidden.bs.collapse')
......
test-infra/npm-shrinkwrap.canonical.json
View file @ 4d96e69a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment