Skip to content

Commit 033706b

Browse files
committed
Rename the config to make clear it is a boolean
1 parent 03cc18f commit 033706b

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

actionview/lib/action_view/helpers/asset_tag_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module AssetTagHelper
2424
mattr_accessor :image_loading
2525
mattr_accessor :image_decoding
2626
mattr_accessor :preload_links_header
27-
mattr_accessor :stylesheet_media_default
27+
mattr_accessor :apply_stylesheet_media_default
2828

2929
# Returns an HTML script tag for each of the +sources+ provided.
3030
#
@@ -170,7 +170,7 @@ def stylesheet_link_tag(*sources)
170170
"href" => href
171171
}.merge!(options)
172172

173-
if stylesheet_media_default && tag_options[:media].blank?
173+
if apply_stylesheet_media_default && tag_options[:media].blank?
174174
tag_options[:media] = "screen"
175175
end
176176

actionview/lib/action_view/railtie.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Railtie < Rails::Engine # :nodoc:
1212
config.action_view.default_enforce_utf8 = nil
1313
config.action_view.image_loading = nil
1414
config.action_view.image_decoding = nil
15-
config.action_view.stylesheet_media_default = true
15+
config.action_view.apply_stylesheet_media_default = true
1616

1717
config.eager_load_namespaces << ActionView
1818

@@ -51,7 +51,7 @@ class Railtie < Rails::Engine # :nodoc:
5151
ActionView::Helpers::AssetTagHelper.image_loading = app.config.action_view.delete(:image_loading)
5252
ActionView::Helpers::AssetTagHelper.image_decoding = app.config.action_view.delete(:image_decoding)
5353
ActionView::Helpers::AssetTagHelper.preload_links_header = app.config.action_view.delete(:preload_links_header)
54-
ActionView::Helpers::AssetTagHelper.stylesheet_media_default = app.config.action_view.delete(:stylesheet_media_default)
54+
ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default = app.config.action_view.delete(:apply_apply_stylesheet_media_default)
5555
end
5656

5757
config.after_initialize do |app|

actionview/test/template/asset_tag_helper_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,13 +506,13 @@ def test_stylesheet_link_tag_with_default_protocol
506506
end
507507

508508
def test_stylesheet_link_tag_with_configured_stylesheet_media_default
509-
original_default_media = ActionView::Helpers::AssetTagHelper.stylesheet_media_default
510-
ActionView::Helpers::AssetTagHelper.stylesheet_media_default = true
509+
original_default_media = ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default
510+
ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default = true
511511

512512
assert_dom_equal %(<link href="/file.css" media="screen" rel="stylesheet" />), stylesheet_link_tag("/file")
513513
assert_dom_equal %(<link href="/file.css" media="all" rel="stylesheet" />), stylesheet_link_tag("/file", media: "all")
514514
ensure
515-
ActionView::Helpers::AssetTagHelper.stylesheet_media_default = original_default_media
515+
ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default = original_default_media
516516
end
517517

518518
def test_javascript_include_tag_without_request

guides/source/configuring.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ Defaults to `'signed cookie'`.
740740
741741
* `config.action_view.button_to_generates_button_tag` determines whether `button_to` will render `<button>` element, regardless of whether or not the content is passed as the first argument or as a block.
742742
743-
* `config.action_view.stylesheet_media_default` determines whether `stylesheet_link_tag` will render `screen` as the default value for the attribute `media` when it's not provided.
743+
* `config.action_view.apply_stylesheet_media_default` determines whether `stylesheet_link_tag` will render `screen` as the default value for the attribute `media` when it's not provided.
744744

745745
### Configuring Action Mailbox
746746

@@ -1049,7 +1049,7 @@ text/javascript image/svg+xml application/postscript application/x-shockwave-fla
10491049

10501050
#### For '6.2', defaults from previous versions below and:
10511051
- `config.action_view.button_to_generates_button_tag`: `true`
1052-
- `config.action_view.stylesheet_media_default` : `false`
1052+
- `config.action_view.apply_stylesheet_media_default` : `false`
10531053
- `config.active_support.key_generator_hash_digest_class`: `OpenSSL::Digest::SHA256`
10541054
- `config.active_support.hash_digest_class`: `OpenSSL::Digest::SHA256`
10551055
- `config.action_dispatch.return_only_request_media_type_on_content_type`: `false`
@@ -1115,7 +1115,7 @@ text/javascript image/svg+xml application/postscript application/x-shockwave-fla
11151115
- `config.action_view.form_with_generates_ids`: `false`
11161116
- `config.action_view.preload_links_header`: `nil`
11171117
- `config.action_view.button_to_generates_button_tag`: `false`
1118-
- `config.action_view.stylesheet_media_default` : `true`
1118+
- `config.action_view.apply_stylesheet_media_default` : `true`
11191119
- `config.active_job.retry_jitter`: `0.0`
11201120
- `config.active_job.skip_after_callbacks_if_terminated`: `false`
11211121
- `config.action_mailbox.queues.incineration`: `:action_mailbox_incineration`

railties/lib/rails/application/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def load_defaults(target_version)
208208

209209
if respond_to?(:action_view)
210210
action_view.button_to_generates_button_tag = true
211-
action_view.stylesheet_media_default = false
211+
action_view.apply_stylesheet_media_default = false
212212
end
213213

214214
if respond_to?(:active_support)

railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_2.rb.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Rails.application.config.action_view.button_to_generates_button_tag = true
1212

1313
# `stylesheet_link_tag` view helper will not render the media attribute by default.
14-
# Rails.application.config.action_view.stylesheet_media_default = false
14+
# Rails.application.config.action_view.apply_stylesheet_media_default = false
1515

1616
# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
1717
# Changing this default means invalidate all encrypted messages generated by

railties/test/application/configuration_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2455,23 +2455,23 @@ class ::DummySerializer < ActiveJob::Serializers::ObjectSerializer; end
24552455
assert_equal false, ActionView::Helpers::AssetTagHelper.preload_links_header
24562456
end
24572457

2458-
test "ActionView::Helpers::AssetTagHelper.stylesheet_media_default is true by default for upgraded apps" do
2458+
test "ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default is true by default for upgraded apps" do
24592459
remove_from_config '.*config\.load_defaults.*\n'
24602460
app "development"
24612461

2462-
assert_equal true, ActionView::Helpers::AssetTagHelper.stylesheet_media_default
2462+
assert_equal true, ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default
24632463
end
24642464

2465-
test "ActionView::Helpers::AssetTagHelper.stylesheet_media_default can be configured via config.action_view.stylesheet_media_default" do
2465+
test "ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default can be configured via config.action_view.apply_stylesheet_media_default" do
24662466
remove_from_config '.*config\.load_defaults.*\n'
24672467

24682468
app_file "config/initializers/new_framework_defaults_6_2.rb", <<-RUBY
2469-
Rails.application.config.action_view.stylesheet_media_default = false
2469+
Rails.application.config.action_view.apply_stylesheet_media_default = false
24702470
RUBY
24712471

24722472
app "development"
24732473

2474-
assert_equal false, ActionView::Helpers::AssetTagHelper.stylesheet_media_default
2474+
assert_equal false, ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default
24752475
end
24762476

24772477
test "stylesheet_link_tag sets the Link header by default" do

0 commit comments

Comments
 (0)