Skip to content

Commit 8b78157

Browse files
committed
Merge pull request #29 from flatlogic/issue19
Fix issue #19
2 parents 293b3ab + 053cbb9 commit 8b78157

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

bootstrap-tabcollapse.js

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,34 @@
5656
this.$tabs.trigger($.Event('show-tabs.bs.tabcollapse'));
5757

5858
var $panelHeadings = this.$accordion.find('.js-tabcollapse-panel-heading').detach();
59+
5960
$panelHeadings.each(function() {
6061
var $panelHeading = $(this),
61-
$parentLi = $panelHeading.data('bs.tabcollapse.parentLi');
62-
view._panelHeadingToTabHeading($panelHeading);
62+
$parentLi = $panelHeading.data('bs.tabcollapse.parentLi');
63+
64+
var $oldHeading = view._panelHeadingToTabHeading($panelHeading);
65+
66+
$parentLi.removeClass('active');
67+
if ($parentLi.parent().hasClass('dropdown-menu') && !$parentLi.siblings('li').hasClass('active')) {
68+
$parentLi.parent().parent().removeClass('active');
69+
}
70+
71+
if (!$oldHeading.hasClass('collapsed')) {
72+
$parentLi.addClass('active');
73+
if ($parentLi.parent().hasClass('dropdown-menu')) {
74+
$parentLi.parent().parent().addClass('active');
75+
}
76+
} else {
77+
$oldHeading.removeClass('collapsed');
78+
}
79+
6380
$parentLi.append($panelHeading);
6481
});
6582

83+
if (!$('li').hasClass('active')) {
84+
$('li').first().addClass('active')
85+
}
86+
6687
var $panelBodies = this.$accordion.find('.js-tabcollapse-panel-body');
6788
$panelBodies.each(function(){
6889
var $panelBody = $(this),

0 commit comments

Comments
 (0)