Skip to content

Fix wrapper options #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2015
Merged

Fix wrapper options #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lib/bootstrap_form/form_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ def form_group_builder(method, options, html_options = nil)

options = convert_form_tag_options(method, options) if acts_like_form_tag

wrapper_class = options.delete(:wrapper_class)
wrapper_options = options.delete(:wrapper)
wrapper_class = css_options.delete(:wrapper_class)
wrapper_options = css_options.delete(:wrapper)
help = options.delete(:help)
icon = options.delete(:icon)
label_col = options.delete(:label_col)
Expand All @@ -299,7 +299,7 @@ def form_group_builder(method, options, html_options = nil)
}

if wrapper_options.is_a?(Hash)
form_group_options.reverse_merge!(wrapper_options)
form_group_options.merge!(wrapper_options)
end

unless options.delete(:skip_label)
Expand Down