Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixes #2941 + whitespace in collapse

  • Loading branch information...
commit 0b8042656fc52600e18fb1c7f54dbbe8a284e737 1 parent 13e4d1d
@fat fat authored
View
4 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')
View
1  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)
}
View
4 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')
View
1  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)
}
Please sign in to comment.
Something went wrong with that request. Please try again.