fixes #2941 + whitespace in collapse

diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js
index 167a57f841230211f6e03e4f59a409041ce61a01..56174955b90e8048848100508dae93ba1a135be0 100644 (file)
--- a/docs/assets/js/bootstrap-alert.js
+++ b/docs/assets/js/bootstrap-alert.js
@@ -27,7 +27,7 @@
   * ====================== */
 
   var dismiss = '[data-dismiss="alert"]'
-    , Alert = function ( el ) {
+    , Alert = function (el) {
         $(el).on('click', dismiss, this.close)
       }
 
@@ -68,7 +68,7 @@
  /* ALERT PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.alert = function ( option ) {
+  $.fn.alert = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('alert')

diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index 30e139cf89e00307dd8896c06d51fcb2aeddf82d..41e097df31fac8cb37b4dbd3b8982a127d4cbd4f 100644 (file)
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -60,6 +60,7 @@
 
       if (actives && actives.length) {
         hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
         actives.collapse('hide')
         hasData || actives.data('collapse', null)
       }

diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index 167a57f841230211f6e03e4f59a409041ce61a01..56174955b90e8048848100508dae93ba1a135be0 100644 (file)
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -27,7 +27,7 @@
   * ====================== */
 
   var dismiss = '[data-dismiss="alert"]'
-    , Alert = function ( el ) {
+    , Alert = function (el) {
         $(el).on('click', dismiss, this.close)
       }
 
@@ -68,7 +68,7 @@
  /* ALERT PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.alert = function ( option ) {
+  $.fn.alert = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('alert')

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 30e139cf89e00307dd8896c06d51fcb2aeddf82d..41e097df31fac8cb37b4dbd3b8982a127d4cbd4f 100644 (file)
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -60,6 +60,7 @@
 
       if (actives && actives.length) {
         hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
         actives.collapse('hide')
         hasData || actives.data('collapse', null)
       }