vendor/assets/javascripts/collapse.js in flashgrid-2.1.2 vs vendor/assets/javascripts/collapse.js in flashgrid-2.2.0
- old
+ new
@@ -77,12 +77,11 @@
this.$element[dimension](this.$element[dimension]())[0].offsetHeight
this.$element
.addClass('collapsing')
- .removeClass('collapse')
- .removeClass('in')
+ .removeClass('collapse in')
this.transitioning = 1
var complete = function () {
this.transitioning = 0
@@ -150,10 +149,10 @@
var parent = $this.attr('data-parent')
var $parent = parent && $(parent)
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)
})
\ No newline at end of file