Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Bugfixes:

- Use #underscore, not #downcase for help text scope (#140, @atipugin)
- Radio button and checkbox labels will now include the disabled class as needed. (#156, @ScottSwezey)
- Can't override primary button classes (#183, @tanimichi)

Features:

Expand Down
4 changes: 2 additions & 2 deletions lib/bootstrap_form/helpers/bootstrap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ module BootstrapForm
module Helpers
module Bootstrap
def submit(name = nil, options = {})
options.merge! class: 'btn btn-default' unless options.has_key? :class
options.reverse_merge! class: 'btn btn-default'
super(name, options)
end

def primary(name = nil, options = {})
options.merge! class: 'btn btn-primary'
options.reverse_merge! class: 'btn btn-primary'
submit(name, options)
end

Expand Down
5 changes: 5 additions & 0 deletions test/bootstrap_other_components_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@ def setup
expected = %{<input class="btn btn-primary" name="commit" type="submit" value="Submit Form" />}
assert_equal expected, @builder.primary("Submit Form")
end

test "override primary button classes" do
expected = %{<input class="btn btn-primary disabled" name="commit" type="submit" value="Submit Form" />}
assert_equal expected, @builder.primary("Submit Form", class: "btn btn-primary disabled")
end
end