mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #14421 from davidpdrsn/reorder-conditionals
Reorder conditional logic in link_to_if and link_to_unless
This commit is contained in:
commit
8cea8ae278
1 changed files with 10 additions and 10 deletions
|
@ -389,15 +389,7 @@ module ActionView
|
|||
# # If not...
|
||||
# # => <a href="/accounts/signup">Reply</a>
|
||||
def link_to_unless(condition, name, options = {}, html_options = {}, &block)
|
||||
if condition
|
||||
if block_given?
|
||||
block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
|
||||
else
|
||||
ERB::Util.html_escape(name)
|
||||
end
|
||||
else
|
||||
link_to(name, options, html_options)
|
||||
end
|
||||
link_to_if !condition, name, options, html_options, &block
|
||||
end
|
||||
|
||||
# Creates a link tag of the given +name+ using a URL created by the set of
|
||||
|
@ -421,7 +413,15 @@ module ActionView
|
|||
# # If they are logged in...
|
||||
# # => <a href="/accounts/show/3">my_username</a>
|
||||
def link_to_if(condition, name, options = {}, html_options = {}, &block)
|
||||
link_to_unless !condition, name, options, html_options, &block
|
||||
if condition
|
||||
link_to(name, options, html_options)
|
||||
else
|
||||
if block_given?
|
||||
block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
|
||||
else
|
||||
ERB::Util.html_escape(name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Creates a mailto link tag to the specified +email_address+, which is
|
||||
|
|
Loading…
Reference in a new issue