Use Alchemy::Current.preview_page? in views

app/controllers/alchemy/admin/pages_controller.rb

@@ -66,7 +66,6 @@ def tree
       # Used by page preview iframe in Page#edit view.
       #
       def show
-        Current.preview_page = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language.locale
         render(layout: Alchemy::Config.get(:admin_page_preview_layout) || "application")
@@ -407,6 +406,7 @@ def load_languages_and_layouts
       end
 
       def set_preview_mode
+        Current.preview_page = @page
         @preview_mode = true
       end
 

app/views/alchemy/_menubar.html.erb

@@ -1,4 +1,4 @@
-<% if !@preview_mode && @page && can?(:edit_content, @page) %>
+<% if !Alchemy::Current.preview_page? && @page && can?(:edit_content, @page) %>
   <alchemy-menubar>
     <template>
       <%= stylesheet_link_tag("alchemy/menubar") %>

app/views/alchemy/_preview_mode_code.html.erb

@@ -1,4 +1,4 @@
-<% if @preview_mode %>
+<% if Alchemy::Current.preview_page? %>
   <script type="text/javascript">
     Alchemy = { locale: "<%= session[:alchemy_locale] %>" };
   </script>

lib/generators/alchemy/menus/templates/node.html.erb

@@ -1,8 +1,8 @@
-<%% cache [node, @page, @preview_mode] do %>
+<%% cache [node, @page, Alchemy::Current.preview_page?] do %>
   <%%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
     <%%= link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

lib/generators/alchemy/menus/templates/node.html.haml

@@ -1,9 +1,9 @@
-- cache [node, @page, @preview_mode] do
+- cache [node, @page, Alchemy::Current.preview_page?] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

lib/generators/alchemy/menus/templates/node.html.slim

@@ -1,9 +1,9 @@
-- cache [node, @page, @preview_mode] do
+- cache [node, @page, Alchemy::Current.preview_page?] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

lib/generators/alchemy/menus/templates/wrapper.html.erb

@@ -1,4 +1,4 @@
-<%% cache [menu, @page, @preview_mode] do %>
+<%% cache [menu, @page, Alchemy::Current.preview_page?] do %>
   <ul class="nav">
     <%%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

lib/generators/alchemy/menus/templates/wrapper.html.haml

@@ -1,4 +1,4 @@
-- cache [menu, @page, @preview_mode] do
+- cache [menu, @page, Alchemy::Current.preview_page?] do
   %ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

lib/generators/alchemy/menus/templates/wrapper.html.slim

@@ -1,4 +1,4 @@
-- cache [menu, @page, @preview_mode] do
+- cache [menu, @page, Alchemy::Current.preview_page?] do
   ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

spec/dummy/app/views/alchemy/menus/footer_navigation/_node.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
   <%= link_to_if node.url,
     node.name,
-    @preview_mode ? 'javascript: void(0)' : node.url,
+    Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
     class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
     title: node.title,
     target: node.external? ? '_blank' : nil,

spec/dummy/app/views/alchemy/menus/main_menu/_node.html.erb

@@ -1,8 +1,8 @@
-<% cache [node, @page, @preview_mode] do %>
+<% cache [node, @page, Alchemy::Current.preview_page?] do %>
   <%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
     <%= link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb

@@ -1,4 +1,4 @@
-<% cache [menu, @page, @preview_mode] do %>
+<% cache [menu, @page, Alchemy::Current.preview_page?] do %>
   <ul class="nav">
     <%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

spec/requests/alchemy/admin/pages_controller_spec.rb

@@ -282,6 +282,7 @@ module Alchemy
         it "should store page as current preview" do
           expect(Current).to receive(:preview_page=).with(page)
           get admin_page_path(page)
+          expect(Alchemy::Current.preview_page?).to be_truthy
         end
 
         it "should set the I18n locale to the pages language code" do