Merge pull request snapappointments#873 from sweatty1/master

closes snapappointments#741 passing in title option being overwritten Conflicts: dist/js/bootstrap-select.js.map
dmitrijs · Jan 19, 2015 · 253bca0 · 253bca0
2 parents d0b9174 + 6a2cfd0
commit 253bca0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/dist/js/bootstrap-select.js b/dist/js/bootstrap-select.js
@@ -535,7 +535,9 @@
  }
  }
 
- this.options.title = this.$element.attr('title');
+ if (this.options.title == undefined) {
+ this.options.title = this.$element.attr('title');
+ }
 
  if (this.options.selectedTextFormat == 'static') {
  title = this.options.title;