@@ -7,15 +7,28 @@ module ActionView
#
#
#
- def clear(what = 'both', height = '0')
- unless %w[left right both].include?(what.to_s)
- height = what
- what = 'both'
+ def clear(clear = 'both', height = '0')
+ options = {}
+ if clear.is_a?(Hash)
+ options = clear.stringify_keys.reverse_merge!('clear' => 'both', 'height' => '0')
+ else
+ unless %w[left right both].include?(clear.to_s)
+ height = clear
+ clear = 'both'
+ end
+ options['height'] = height
+ options['clear'] = clear
end
- if height.to_i.to_s == height.to_s
- height = "#{height}px" unless height.to_s == '0'
+ if options['height'].to_i.to_s == options['height'].to_s
+ options['height'] = "#{options['height']}px" unless options['height'].to_s == '0'
end
- %Q{<div style="clear:#{what}; height: #{height}; max-height: #{height}; font-size: #{height}; line-height: #{height};"> </div>}
+
+ options.reverse_merge!('max-height' => options['height'],
+ 'font-size' => options['height'],
+ 'line-height' => options['height'])
+
+ # the sort is really just so the tests pass easily
+ %Q{<div style="#{options.map {|e| "#{e.first}: #{e.last}" }.sort.join('; ')}"> </div>}
end
end
lib/clear_helper.rb
@@ -7,11 +7,15 @@ class ClearHelperTest < Test::Unit::TestCase
include ActionView::Helpers::TagHelper
def test_clear_helper
- assert_equal '<div style="clear:both; height: 0; max-height: 0; line-height: 0;"> </div>', clear
- assert_equal '<div style="clear:left; height: 0; max-height: 0; line-height: 0;"> </div>', clear(:left)
- assert_equal '<div style="clear:left; height: 0; max-height: 0; line-height: 0;"> </div>', clear('left')
- assert_equal '<div style="clear:right; height: 10px; max-height: 10px; line-height: 10px;"> </div>', clear(:right, 10)
- assert_equal '<div style="clear:both; height: 2.5em; max-height: 2.5em; line-height: 2.5em;"> </div>', clear('2.5em')
- assert_equal '<div style="clear:both; height: 5px; max-height: 5px; line-height: 5px;"> </div>', clear(5)
+ assert_equal '<div style="clear: both; font-size: 0; height: 0; line-height: 0; max-height: 0"> </div>', clear
+ assert_equal '<div style="clear: left; font-size: 0; height: 0; line-height: 0; max-height: 0"> </div>', clear(:left)
+ assert_equal '<div style="clear: left; font-size: 0; height: 0; line-height: 0; max-height: 0"> </div>', clear('left')
+ assert_equal '<div style="clear: right; font-size: 10px; height: 10px; line-height: 10px; max-height: 10px"> </div>', clear(:right, 10)
+ assert_equal '<div style="clear: both; font-size: 2.5em; height: 2.5em; line-height: 2.5em; max-height: 2.5em"> </div>', clear('2.5em')
+ assert_equal '<div style="clear: both; font-size: 5px; height: 5px; line-height: 5px; max-height: 5px"> </div>', clear(5)
+ assert_equal '<div style="clear: both; font-size: 0; height: 0; line-height: 0; max-height: 0"> </div>', clear(:clear => :both)
+ assert_equal '<div style="clear: both; font-size: 0; height: 0; line-height: 0; max-height: 0"> </div>', clear(:clear => :both)
+ assert_equal '<div style="clear: both; font-size: 5px; height: 5px; line-height: 5px; max-height: 5px; width: 99%"> </div>', clear(:clear => :both, :height => 5, :width => '99%')
+ assert_equal '<div style="clear: both; font-size: 0; height: 0; line-height: 0; max-height: 0; width: 99%"> </div>', clear(:width => '99%')
end
end
test/clear_helper_test.rb
106d540db483593d06492fe44e1166059cbe130c
Philip Hallstrom
philip@pjkh.com
http://github.com/phallstrom/clear_helper/commit/308943116f2e8b4d8704ede37f1882c8a258e00a
308943116f2e8b4d8704ede37f1882c8a258e00a
2008-12-24T13:46:46-08:00
2008-12-24T13:46:46-08:00
update clear helper to take an hash as an argument whose keys are stringified and turned into the style specific attributes
46660aed978a504a7ee73310d2de5bb4e669970e
Philip Hallstrom
philip@pjkh.com