diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-06-28 11:49:14 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 11:49:14 -0300 |
| commit | bbcea4f3b0106d6c7531c4d1cd902653f2ff6991 (patch) | |
| tree | ef98825d33a22845dd44f36c2124a9fa92edc62c /actionview/lib/action_view | |
| parent | a3d47122e52e0b5bef25268b0b4168cf7803d9b8 (diff) | |
| parent | 940eec417f20e53abd3e3114c7fa845dac0d3a62 (diff) | |
| download | rails-bbcea4f3b0106d6c7531c4d1cd902653f2ff6991.tar.gz rails-bbcea4f3b0106d6c7531c4d1cd902653f2ff6991.tar.bz2 rails-bbcea4f3b0106d6c7531c4d1cd902653f2ff6991.zip | |
Merge pull request #25555 from vipulnsward/boolean-attributes-update
Bring Boolean Attributes list for AV Tags helper upto speed with current spec
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_tag_helper.rb | 4 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/tag_helper.rb | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb index 413c35954c..bcbb3db6a9 100644 --- a/actionview/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb @@ -264,8 +264,8 @@ module ActionView # # => <video src="/videos/trailer"></video> # video_tag("trailer.ogg") # # => <video src="/videos/trailer.ogg"></video> - # video_tag("trailer.ogg", controls: true, autobuffer: true) - # # => <video autobuffer="autobuffer" controls="controls" src="/videos/trailer.ogg" ></video> + # video_tag("trailer.ogg", controls: true, preload: 'none') + # # => <video preload="none" controls="controls" src="/videos/trailer.ogg" ></video> # video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png") # # => <video src="/videos/trailer.m4v" width="16" height="10" poster="/assets/screenshot.png"></video> # video_tag("/trailers/hd.avi", size: "16x16") diff --git a/actionview/lib/action_view/helpers/tag_helper.rb b/actionview/lib/action_view/helpers/tag_helper.rb index 655e777d1d..b026bcf0f4 100644 --- a/actionview/lib/action_view/helpers/tag_helper.rb +++ b/actionview/lib/action_view/helpers/tag_helper.rb @@ -11,12 +11,15 @@ module ActionView include CaptureHelper include OutputSafetyHelper - BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer - autoplay controls loop selected hidden scoped async - defer reversed ismap seamless muted required - autofocus novalidate formnovalidate open pubdate - itemscope allowfullscreen default inert sortable - truespeed typemustmatch).to_set + BOOLEAN_ATTRIBUTES = %w(allowfullscreen async autofocus autoplay checked + compact controls declare default defaultchecked + defaultmuted defaultselected defer disabled + enabled formnovalidate hidden indeterminate inert + ismap itemscope loop multiple muted nohref + noresize noshade novalidate nowrap open + pauseonexit readonly required reversed scoped + seamless selected sortable truespeed typemustmatch + visible).to_set BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map(&:to_sym)) |