Skip to content

Commit

Permalink
Extract input_checked? to a module
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelfranca committed Jan 17, 2012
1 parent 8b4c74f commit 6f1bf52
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 9 deletions.
9 changes: 0 additions & 9 deletions actionpack/lib/action_view/helpers/tags/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ def retrieve_object(object)
nil
end

def input_checked?(object, options)
if options.has_key?("checked")
checked = options.delete "checked"
checked == true || checked == "checked"
else
checked?(value(object))
end
end

def retrieve_autoindex(pre_match)
object = self.object || @template_object.instance_variable_get("@#{pre_match}")
if object && object.respond_to?(:to_param)
Expand Down
4 changes: 4 additions & 0 deletions actionpack/lib/action_view/helpers/tags/check_box.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
require 'action_view/helpers/tags/checkable'

module ActionView
module Helpers
module Tags
class CheckBox < Base #:nodoc:
include Checkable

def initialize(object_name, method_name, template_object, checked_value, unchecked_value, options)
@checked_value = checked_value
@unchecked_value = unchecked_value
Expand Down
16 changes: 16 additions & 0 deletions actionpack/lib/action_view/helpers/tags/checkable.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module ActionView
module Helpers
module Tags
module Checkable
def input_checked?(object, options)
if options.has_key?("checked")
checked = options.delete "checked"
checked == true || checked == "checked"
else
checked?(value(object))
end
end
end
end
end
end
4 changes: 4 additions & 0 deletions actionpack/lib/action_view/helpers/tags/radio_button.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
require 'action_view/helpers/tags/checkable'

module ActionView
module Helpers
module Tags
class RadioButton < Base #:nodoc:
include Checkable

def initialize(object_name, method_name, template_object, tag_value, options)
@tag_value = tag_value
super(object_name, method_name, template_object, options)
Expand Down

0 comments on commit 6f1bf52

Please sign in to comment.