aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDan Pickett <dpickett@enlightsolutions.com>2011-04-29 19:18:10 -0400
committerDan Pickett <dpickett@enlightsolutions.com>2011-04-29 19:18:10 -0400
commit1efaed5af13f876833b3acd614e8d0116812f308 (patch)
tree8b2dd01afee8b4bdcf976d6a082d9fb89b32d43e /actionpack
parent85c8d73642f03410b86ee842edcfe0eba1d4252c (diff)
parent010dbf7a2fd30f8dabebb3f04fed22c661d6bf80 (diff)
downloadrails-1efaed5af13f876833b3acd614e8d0116812f308.tar.gz
rails-1efaed5af13f876833b3acd614e8d0116812f308.tar.bz2
rails-1efaed5af13f876833b3acd614e8d0116812f308.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb2
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)