Skip to content

Commit af2511e

Browse files
committed
Merge pull request #36 from mwgamble/tabcontent_selector_fix
Fix check to see if supplied tab content selector worked
2 parents a656cef + 7af42a3 commit af2511e

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

bootstrap-tabcollapse.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
this.$accordion.html('');
9494

9595
if(this.options.updateLinks) {
96-
var $tabContents = $(this.options.tabContentSelector) || this.$tabs.siblings('.tab-content')
96+
var $tabContents = this.getTabContentElement();
9797
$tabContents.find('[data-toggle-was="tab"], [data-toggle-was="pill"]').each(function() {
9898
var $el = $(this);
9999
var href = $el.attr('href').replace(/-collapse$/g, '');
@@ -109,6 +109,14 @@
109109
this.$tabs.trigger($.Event('shown-tabs.bs.tabcollapse'));
110110
};
111111

112+
TabCollapse.prototype.getTabContentElement = function(){
113+
var $tabContents = $(this.options.tabContentSelector);
114+
if($tabContents.length === 0) {
115+
$tabContents = this.$tabs.siblings('.tab-content');
116+
}
117+
return $tabContents;
118+
};
119+
112120
TabCollapse.prototype.showAccordion = function(){
113121
this.$tabs.trigger($.Event('show-accordion.bs.tabcollapse'));
114122

@@ -186,8 +194,7 @@
186194
this.$accordion = $('<div class="panel-group ' + this.options.accordionClass + '" id="' + accordionId +'"></div>');
187195
this.$tabs.after(this.$accordion);
188196
this.$tabs.addClass(this.options.tabsClass);
189-
var $tabContents = $(this.options.tabContentSelector) || this.$tabs.siblings('.tab-content')
190-
$tabContents.addClass(this.options.tabsClass);
197+
this.getTabContentElement().addClass(this.options.tabsClass);
191198
};
192199

193200
TabCollapse.prototype._createAccordionGroup = function(parentId, $heading){

0 commit comments

Comments
 (0)