diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-08 21:35:17 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-08 21:35:17 +0530 |
| commit | cff1d751d09e8586f47ae25416085e05ade4f7cd (patch) | |
| tree | 5d01aacbc5f7b26fbcf8b3e0dca228114fcb9743 /actionpack/lib/action_view/helpers | |
| parent | 34f61f8b1ddf24e3dcc45b10536fff8eb46b3063 (diff) | |
| parent | 1ffd5ec91069167043c8ecd0d949098f566d88eb (diff) | |
| download | rails-cff1d751d09e8586f47ae25416085e05ade4f7cd.tar.gz rails-cff1d751d09e8586f47ae25416085e05ade4f7cd.tar.bz2 rails-cff1d751d09e8586f47ae25416085e05ade4f7cd.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
railties/guides/source/active_record_querying.textile
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 1adcd716f8..842f4c23a3 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -94,7 +94,7 @@ module ActionView # If +html_options+ has an <tt>:onclick</tt>, that one is put before +function+. Once all # the JavaScript is set, the helper appends "; return false;". # - # The +href+ attribute of the tag is set to "#" unles +html_options+ has one. + # The +href+ attribute of the tag is set to "#" unless +html_options+ has one. # # link_to_function "Greeting", "alert('Hello world!')", :class => "nav_link" # # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a> |