consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix helper to merge style option correctly

Browse Source
This commit is contained in:
Marko Lovic
2018-08-23 18:28:25 +02:00
committed by Javi Martín
parent 1fb1437886
commit ca5f8719a8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/globalize_helper.rb
View File

@@ -11,7 +11,7 @@ module GlobalizeHelper
end end
def display_translation?(locale) def display_translation?(locale)
same_locale?(neutral_locale(I18n.locale), neutral_locale(locale)) ? "" : "display: none" same_locale?(neutral_locale(I18n.locale), neutral_locale(locale)) ? "" : "display: none;"
end end
def translation_enabled_tag(locale, enabled) def translation_enabled_tag(locale, enabled)
@@ -19,7 +19,7 @@ module GlobalizeHelper
end end
def css_to_display_translation?(resource, locale) def css_to_display_translation?(resource, locale)
enable_locale?(resource, locale) ? "" : "display: none" enable_locale?(resource, locale) ? "" : "display: none;"
end end
def enable_locale?(resource, locale) def enable_locale?(resource, locale)

2
app/helpers/site_customization_helper.rb
View File

@@ -4,6 +4,6 @@ module SiteCustomizationHelper
end end
def site_customization_display_translation?(locale) def site_customization_display_translation?(locale)
site_customization_enable_translation?(locale) ? "" : "display: none" site_customization_enable_translation?(locale) ? "" : "display: none;"
end end
end end

4
app/helpers/translatable_form_helper.rb
View File

@@ -15,11 +15,11 @@ module TranslatableFormHelper
def merge_translatable_field_options(options, locale) def merge_translatable_field_options(options, locale)
options.merge( options.merge(
class: "#{options[:class]} js-globalize-attribute".strip, class: "#{options[:class]} js-globalize-attribute".strip,
style: display_translation?(locale), style: "#{options[:style]} #{display_translation?(locale)}".strip,
data: options.fetch(:data, {}).merge(locale: locale), data: options.fetch(:data, {}).merge(locale: locale),
label_options: { label_options: {
class: "#{options.dig(:label_options, :class)} js-globalize-attribute".strip, class: "#{options.dig(:label_options, :class)} js-globalize-attribute".strip,
style: display_translation?(locale), style: "#{options.dig(:label_options, :style)} #{display_translation?(locale)}".strip,
data: (options.dig(:label_options, :data) || {}) .merge(locale: locale) data: (options.dig(:label_options, :data) || {}) .merge(locale: locale)
} }
) )