diff --git a/app/assets/javascripts/settings.coffee b/app/assets/javascripts/settings.coffee index 13ff10ed..bc6ac2e1 100644 --- a/app/assets/javascripts/settings.coffee +++ b/app/assets/javascripts/settings.coffee @@ -103,6 +103,7 @@ if window.URL? or window.webkitURL? # theming previewStyle = document.createElement 'style' +previewStyle.setAttribute('data-turbolinks-track', 'false') document.head.appendChild previewStyle previewTimeout = null @@ -171,7 +172,6 @@ generateTheme = (payload) -> console.log plKey if theme_attribute_map[plKey] if theme_attribute_map[plKey].includes 'text' - console.log "aaa" hex = getHexColorFromThemeValue(payload[plKey]) body += "--#{theme_attribute_map[plKey]}: #{getDecimalTripletsFromHex(hex)};\n" else diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb index 13f74a0a..16c26297 100644 --- a/app/helpers/theme_helper.rb +++ b/app/helpers/theme_helper.rb @@ -43,7 +43,7 @@ module ThemeHelper body += "}" - content_tag(:style, body) + content_tag(:style, body, data: { "turbolinks-track": false }) end def get_active_theme diff --git a/spec/helpers/theme_helper_spec.rb b/spec/helpers/theme_helper_spec.rb index 1448c2fe..5db03987 100644 --- a/spec/helpers/theme_helper_spec.rb +++ b/spec/helpers/theme_helper_spec.rb @@ -18,7 +18,7 @@ describe ThemeHelper, :type => :helper do end it "returns a theme" do - expect(helper.render_theme).to include("