add support for prepend and append on the same input

kristianmandrup · Jun 12, 2012 · 7e82a91 · 7e82a91
1 parent 424a9dc
commit 7e82a91
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/formtastic-bootstrap/inputs/base/wrapping.rb b/lib/formtastic-bootstrap/inputs/base/wrapping.rb
@@ -9,14 +9,18 @@ def generic_input_wrapping(&block)
           control_group_div_wrapping do
             label_html <<
             input_div_wrapping do
-              if options[:prepend]
+              if options[:prepend] && !options[:append]
                 prepended_input_wrapping do
                   [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield].join("\n").html_safe
                 end
-              elsif options[:append]
+              elsif options[:append] && !options[:prepend]
                 appended_input_wrapping do
                   [yield, template.content_tag(:span, options[:append], :class => 'add-on')].join("\n").html_safe
                 end
+              elsif options[:append] && options[:prepend]
+                appended_input_wrapping do
+                  [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield, template.content_tag(:span, options[:append], :class => 'add-on')].join("\n").html_safe
+                end
               else
                 yield
               end