Merge pull request snapappointments#170 from caseyjhol/master

Add snapappointments#158
fionamt · Jun 11, 2013 · b3b23a4 · b3b23a4
2 parents efabab9 + 04f5518
commit b3b23a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/bootstrap-select.js b/bootstrap-select.js
@@ -221,7 +221,14 @@
  title = _this.options.title != undefined ? _this.options.title : _this.options.noneSelectedText;
  }
 
- _this.$newElement.find('.filter-option').html( title );
+ var subtext; 
+ if (this.options.showSubtext && this.$element.find('option:selected').attr('data-subtext')) {
+ subtext = ' <small class="muted">'+this.$element.find('option:selected').data('subtext') +'</small>';
+ } else {
+ subtext = '';
+ }
+
+ _this.$newElement.find('.filter-option').html( title + subtext );
  },
 
  setSize:function() {
@@ -568,11 +575,12 @@
  noneSelectedText : 'Nothing selected',
  width: null,
  container: false,
- hideDisabled: false
+ hideDisabled: false,
+ showSubtext: false
  }
 
  $(document)
  .data('keycount',0)
  .on('keydown', '[data-toggle=dropdown], [role=menu]' , Selectpicker.prototype.keydown)
 
-}(window.jQuery);
+}(window.jQuery);