Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2014-07-12 18:44:16 +0400
committerGleb Mazovetskiy <glex.spb@gmail.com>2014-07-12 20:23:39 +0400
commit43a76e57c9e3d8c53603ef0956b80e9dfcb24931 (patch)
tree574c4c47cdc67ff2b3d623cec533b9ac12ed2aee /assets/javascripts/bootstrap/collapse.js
parentd5625c907168b6311be122b99d89614e02448475 (diff)
rake convert
Diffstat (limited to 'assets/javascripts/bootstrap/collapse.js')
-rw-r--r--assets/javascripts/bootstrap/collapse.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js
index e4e6d79..5a52424 100644
--- a/assets/javascripts/bootstrap/collapse.js
+++ b/assets/javascripts/bootstrap/collapse.js
@@ -88,8 +88,7 @@
this.$element
.addClass('collapsing')
- .removeClass('collapse')
- .removeClass('in')
+ .removeClass('collapse in')
this.transitioning = 1
@@ -161,7 +160,7 @@
if (!data || !data.transitioning) {
if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed')
- $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+ $this.toggleClass('collapsed', $target.hasClass('in'))
}
Plugin.call($target, option)