diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
| commit | 2fbf302149cf40c791ca1207a5f984cf58903397 (patch) | |
| tree | 5da770d0fd31520a6264a9864b1db1412646d100 /actionpack | |
| parent | a0656989c47c29c87c4f243ce3695c39777c67b8 (diff) | |
| parent | b84b759ec60b5005fea183186639408fcf903450 (diff) | |
| download | rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.gz rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.bz2 rails-2fbf302149cf40c791ca1207a5f984cf58903397.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
railties/guides/source/contributing_to_ruby_on_rails.textile
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb index 0fe2e6d1a6..1eadfc0390 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb @@ -128,6 +128,8 @@ module HTML # (no parent element). # * <tt>:empty</tt> -- Match the element only if it has no child elements, # and no text content. + # * <tt>:content(string)</tt> -- Match the element only if it has <tt>string</tt> + # as its text content (ignoring leading and trailing whitespace). # * <tt>:only-child</tt> -- Match the element if it is the only child (element) # of its parent element. # * <tt>:only-of-type</tt> -- Match the element if it is the only child (element) |