Skip to content

Commit

Permalink
Fix compatibility layer when bootstrap-select-rails is not installed.
Browse files Browse the repository at this point in the history
  • Loading branch information
lowjoel committed Feb 23, 2016
1 parent 1745dd4 commit f5b09e5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
### bug fixes
* Do not change selects to the Bootstrap select class unless they are explicitly select fields.
Other types of controls also give select fields -- typeaheads and the like.
* Fix compatibility layer for Bootstrap selects when the `bootstrap-select-rails` is not installed.

## 1.2.0

Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/simple_form-bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//= require simple_form-bootstrap/date_time_input
//= require simple_form-bootstrap/select_input
//= require simple_form-bootstrap/token_input

(function($) {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/simple_form-bootstrap/select_input.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
return;
}

$.fn.selectpicker = function(arg) {
return methods.initialise.call(this, arg);
$.fn.selectpicker = function() {
return this;
};
}(jQuery));

0 comments on commit f5b09e5

Please sign in to comment.