From 5b401a8c16bf54aad4df38790d20f05bfea03822 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 2 Jun 2012 17:28:38 -0700
Subject: add collapsed class to collapse invoker when it's target is collapsed
 #3525

---
 js/bootstrap-collapse.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/bootstrap-collapse.js')

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index fbc915b9f..da64a3238 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -144,12 +144,13 @@
   * ==================== */
 
   $(function () {
-    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
       var $this = $(this), href
         , target = $this.attr('data-target')
           || e.preventDefault()
           || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
         , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
       $(target).collapse(option)
     })
   })
-- 
cgit v1.2.3


From 91a7274a43836484cdf27e34c45856e4b715f778 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 2 Jun 2012 21:26:34 -0700
Subject: only set height explicitly for collapse when animation is supported
 #2131

---
 js/bootstrap-collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/bootstrap-collapse.js')

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index da64a3238..45eea2906 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -67,7 +67,7 @@
 
       this.$element[dimension](0)
       this.transition('addClass', $.Event('show'), 'shown')
-      this.$element[dimension](this.$element[0][scroll])
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
     }
 
   , hide: function () {
-- 
cgit v1.2.3


From e510306196b6433dc73302d24ca58313d3a31ec7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 19 Aug 2012 23:07:18 -0700
Subject: bump versions to 2.1.0

---
 js/bootstrap-collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/bootstrap-collapse.js')

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 45eea2906..391d91281 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.4
+ * bootstrap-collapse.js v2.1.0
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
-- 
cgit v1.2.3