diff --git a/entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb b/entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb index a62fdbaaab..7dbbb58272 100644 --- a/entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb +++ b/entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb @@ -21,7 +21,7 @@ def show render( locals: { entry:, - widget_scope: get_entry_mode_from_env, + entry_mode: get_entry_mode_from_env, seed_options: { embed: get_embed_from_env, origin_url: request.original_url diff --git a/entry_types/scrolled/app/helpers/pageflow_scrolled/cache_helper.rb b/entry_types/scrolled/app/helpers/pageflow_scrolled/cache_helper.rb index beeebc6c5a..078504d624 100644 --- a/entry_types/scrolled/app/helpers/pageflow_scrolled/cache_helper.rb +++ b/entry_types/scrolled/app/helpers/pageflow_scrolled/cache_helper.rb @@ -1,11 +1,11 @@ module PageflowScrolled # @api private module CacheHelper - def cache_scrolled_entry(entry:, widget_scope:, &) + def cache_scrolled_entry(entry:, entry_mode:, &) condition = - widget_scope == :published && + entry_mode == :published && entry.feature_state('scrolled_entry_fragment_caching') - cache_if(condition, [entry, :head_and_body, widget_scope], &) + cache_if(condition, [entry, :head_and_body, entry_mode], &) end end end diff --git a/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb b/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb index 3c51d66880..6ae0553242 100644 --- a/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb +++ b/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb @@ -16,7 +16,7 @@ def scrolled_editor_iframe_seed_html_script_tag(entry) html = render(template: 'pageflow_scrolled/entries/show', locals: { entry:, - widget_scope: :editor, + entry_mode: :editor, skip_ssr: true, skip_structured_data: true, skip_feed_link_tags: true, diff --git a/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb b/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb index 796f2265f6..6ed92de3a3 100644 --- a/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb +++ b/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb @@ -29,10 +29,10 @@ def scrolled_editor_stylesheet_packs_tag(entry) ) end - def scrolled_frontend_packs(entry, widget_scope:) + def scrolled_frontend_packs(entry, entry_mode:) ['pageflow-scrolled-frontend'] + - scrolled_additional_frontend_packs(entry, widget_scope) + - scrolled_frontend_widget_type_packs(entry, widget_scope) + scrolled_additional_frontend_packs(entry, entry_mode) + + scrolled_frontend_widget_type_packs(entry, entry_mode) end def scrolled_editor_packs(entry) diff --git a/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb b/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb index ab1cab5b01..998bb99ef2 100644 --- a/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb +++ b/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb @@ -1,4 +1,4 @@ -<%= cache_scrolled_entry(entry: entry, widget_scope: widget_scope) do %> +<%= cache_scrolled_entry(entry: entry, entry_mode: entry_mode) do %> <%= content_tag(:html, lang: entry.locale, dir: text_direction(entry.locale)) do %> @@ -13,15 +13,15 @@ <%= hreflang_link_tags_for_entry(entry) unless local_assigns[:skip_hreflang_link_tags] %> <%= feed_link_tags_for_entry(entry) unless local_assigns[:skip_feed_link_tags] %> - <%= scrolled_favicons_for_entry(entry, entry_mode: widget_scope) %> + <%= scrolled_favicons_for_entry(entry, entry_mode: entry_mode) %> <%= javascript_include_tag 'pageflow_scrolled/legacy' %> - <%= scrolled_frontend_stylesheet_packs_tag(entry, widget_scope: widget_scope) %> + <%= scrolled_frontend_stylesheet_packs_tag(entry, entry_mode: entry_mode) %> <%= scrolled_theme_properties_style_tag(entry.theme) %> <%= scrolled_theme_stylesheet_pack_tags(entry.theme) %> - <%= render_widget_head_fragments(entry, scope: widget_scope) %> + <%= render_widget_head_fragments(entry, scope: entry_mode) %> <% if Rails.env.development? %>