Merge pull request #12983 from twbs/fat-9836

fixes #9836

Merge pull request #12983 from twbs/fat-9836
fixes #9836
e4d13e23 · Mark Otto · 90eb5249 · b8ab0c66 · e4d13e23 · e4d13e23
Commit e4d13e23 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 13 additions and 9 deletions
+13 -9
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
    this.transitioning = 1
-    var complete = function () {
+    var complete = function (e) {
+      if (e && e.target != this.$element[0]) return
      this.$element
        .removeClass('collapsing')
        .addClass('collapse in')
@@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
    this.transitioning = 1
-    var complete = function () {
+    var complete = function (e) {
+      if (e && e.target != this.$element[0]) return
      this.transitioning = 0
      this.$element
        .trigger('hidden.bs.collapse')

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -56,7 +56,8 @@
    this.transitioning = 1
-    var complete = function () {
+    var complete = function (e) {
+      if (e && e.target != this.$element[0]) return
      this.$element
        .removeClass('collapsing')
        .addClass('collapse in')
@@ -95,7 +96,8 @@
    this.transitioning = 1
-    var complete = function () {
+    var complete = function (e) {
+      if (e && e.target != this.$element[0]) return
      this.transitioning = 0
      this.$element
        .trigger('hidden.bs.collapse')

--- a/test-infra/npm-shrinkwrap.canonical.json
+++ b/test-infra/npm-shrinkwrap.canonical.json