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

Reset language select after adding a language

Browse Source 
It worked differently after upgrading to jQuery 3. According to the
jQuery upgrade guide:

> It is almost always a mistake to use .removeAttr("checked") on a DOM
> element. The only time it might be useful is if the DOM is later going
> to be serialized back to an HTML string. In all other cases,
> .prop("checked", false) should be used instead.
This commit is contained in:
Javi Martín
2020-08-12 21:42:49 +02:00
committed by Senén Rodero Rodríguez
parent f4916a981a
commit 996062fa19
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/globalize.js
View File

@@ -7,7 +7,7 @@
display_locale: function(locale) { display_locale: function(locale) {
App.Globalize.enable_locale(locale); App.Globalize.enable_locale(locale);
App.Globalize.add_language(locale); App.Globalize.add_language(locale);
$(".js-add-language option:selected").removeAttr("selected"); $(".js-add-language option:selected").prop("selected", false);
}, },
display_translations: function(locale) { display_translations: function(locale) {
$(".js-select-language option[value=" + locale + "]").prop("selected", true); $(".js-select-language option[value=" + locale + "]").prop("selected", true);

1
spec/system/admin/translatable_spec.rb
View File

@@ -493,6 +493,7 @@ describe "Admin edit translatable records" do
select "Français", from: :add_language select "Français", from: :add_language
expect_to_have_language_selected "Français" expect_to_have_language_selected "Français"
expect(page).to have_select :add_language, selected: "Add language"
expect(page).to have_field "contents_content_#{content.key}values_value_fr" expect(page).to have_field "contents_content_#{content.key}values_value_fr"
end end