From b385d4d50f372de65d8c6c33a4b8256403894483 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Mon, 20 Sep 2021 21:43:22 +0900
Subject: [PATCH] Fix filtering multi-select fails to deselect options

due to the behavior change in jQuery 3.0
https://jquery.com/upgrade-guide/3.0/#breaking-change-removeattr-no-longer-sets-properties-to-false
Refs. #3389
---
 app/assets/javascripts/rails_admin/ra.filtering-multiselect.js | 2 +-
 app/assets/javascripts/rails_admin/ra.nested-form-hooks.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js b/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
index eadc918c95..5d121996ee 100644
--- a/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
+++ b/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
@@ -225,7 +225,7 @@
     _deSelect: function(options) {
       var widget = this;
       options.each(function(i, option) {
-        widget.element.find('option[value="' + option.value + '"]').removeAttr("selected");
+        widget.element.find('option[value="' + option.value + '"]').prop('selected', false);
       });
       $(options).appendTo(this.collection).prop('selected', false);
     },
diff --git a/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js b/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js
index 5bce97dd57..099736934b 100644
--- a/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js
+++ b/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js
@@ -53,7 +53,7 @@
       add_button.addClass('add_nested_fields').html(add_button.data('add-label'));
     }
     field.find('[required]').each(function() {
-      $(this).removeAttr('required');
+      $(this).prop('required', false);
     });
   });
 }(jQuery));