From cf4c30b1434c901580cd46dcf0501afe68a4e80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 15 Oct 2018 18:03:20 +0200 Subject: [PATCH] Prefix classes used in JavaScript with "js-" The same way it's done in the rest of the application. --- app/assets/javascripts/globalize.js.coffee | 4 ++-- app/views/admin/legislation/questions/_form.html.erb | 2 +- app/views/admin/shared/_common_globalize_locales.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/globalize.js.coffee b/app/assets/javascripts/globalize.js.coffee index 92dcef6e8..d0869cc8e 100644 --- a/app/assets/javascripts/globalize.js.coffee +++ b/app/assets/javascripts/globalize.js.coffee @@ -16,7 +16,7 @@ App.Globalize = else $(this).hide() $('.js-delete-language').hide() - $('#delete_' + locale).show() + $('#js_delete_' + locale).show() highlight_locale: (element) -> $('.js-globalize-locale-link').removeClass('is-active'); @@ -72,7 +72,7 @@ App.Globalize = $(this).hide() App.Globalize.remove_language(locale) - $(".add-fields-container").on "cocoon:after-insert", -> + $(".js-add-fields-container").on "cocoon:after-insert", -> $.each( App.Globalize.enabled_locales(), (index, locale) -> App.Globalize.enable_locale(locale) diff --git a/app/views/admin/legislation/questions/_form.html.erb b/app/views/admin/legislation/questions/_form.html.erb index 6bfe3f54c..a6d91d906 100644 --- a/app/views/admin/legislation/questions/_form.html.erb +++ b/app/views/admin/legislation/questions/_form.html.erb @@ -35,7 +35,7 @@ <%= render 'question_option_fields', f: ff %> <% end %> -
+
<%= link_to_add_association t("admin.legislation.questions.form.add_option"), f, :question_options, class: "button hollow" %> diff --git a/app/views/admin/shared/_common_globalize_locales.html.erb b/app/views/admin/shared/_common_globalize_locales.html.erb index a51fa1432..3f7bc888f 100644 --- a/app/views/admin/shared/_common_globalize_locales.html.erb +++ b/app/views/admin/shared/_common_globalize_locales.html.erb @@ -1,6 +1,6 @@ <% I18n.available_locales.each do |locale| %> <%= link_to t("admin.translations.remove_language"), "#", - id: "delete_#{locale}", + id: "js_delete_#{locale}", style: display_translation_style(resource, locale), class: 'float-right delete js-delete-language', data: { locale: locale } %>