From 3bf7956ce00fd60f8bfa84c47b67fa2f52bcff6f Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 13 Aug 2019 23:28:36 +0000
Subject: [PATCH] Fix jQuery.fn.attr('selected') might use property instead of
 attribute (#31894, #31196).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18365 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/users/new.html.erb      | 2 +-
 public/javascripts/application.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 088f272e4..f65bea1f2 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -20,7 +20,7 @@
         $('input#user_mail').val(ui.item.mail);
         $('select#user_auth_source_id option').each(function(){
           if ($(this).attr('value') == ui.item.auth_source_id) {
-            $(this).attr('selected', true);
+            $(this).prop('selected', true);
             $('select#user_auth_source_id').trigger('change');
           }
         });
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 019b45dc4..b6658c71c 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -177,7 +177,7 @@ function buildFilterRow(field, operator, values) {
   select = tr.find('td.operator select');
   for (i = 0; i < operators.length; i++) {
     var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
-    if (operators[i] == operator) { option.attr('selected', true); }
+    if (operators[i] == operator) { option.prop('selected', true); }
     select.append(option);
   }
   select.change(function(){ toggleOperator(field); });
@@ -198,7 +198,7 @@ function buildFilterRow(field, operator, values) {
       var option = $('<option>');
       if ($.isArray(filterValue)) {
         option.val(filterValue[1]).text(filterValue[0]);
-        if ($.inArray(filterValue[1], values) > -1) {option.attr('selected', true);}
+        if ($.inArray(filterValue[1], values) > -1) {option.prop('selected', true);}
         if (filterValue.length == 3) {
           var optgroup = select.find('optgroup').filter(function(){return $(this).attr('label') == filterValue[2]});
           if (!optgroup.length) {optgroup = $('<optgroup>').attr('label', filterValue[2]);}
@@ -206,7 +206,7 @@ function buildFilterRow(field, operator, values) {
         }
       } else {
         option.val(filterValue).text(filterValue);
-        if ($.inArray(filterValue, values) > -1) {option.attr('selected', true);}
+        if ($.inArray(filterValue, values) > -1) {option.prop('selected', true);}
       }
       select.append(option);
     }
@@ -240,7 +240,7 @@ function buildFilterRow(field, operator, values) {
       var filterValue = filterValues[i];
       var option = $('<option>');
       option.val(filterValue[1]).text(filterValue[0]);
-      if (values[0] == filterValue[1]) { option.attr('selected', true); }
+      if (values[0] == filterValue[1]) { option.prop('selected', true); }
       select.append(option);
     }
     break;