Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-11 15:56:03 +01:00
Code Issues Packages Projects Releases Activity

Fix jQuery.fn.attr('selected') might use property instead of attribute (#31894, #31196).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18365 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-08-13 23:28:36 +00:00
parent e2a00d2dc8
commit 3bf7956ce0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/new.html.erb
View File

@@ -20,7 +20,7 @@
$('input#user_mail').val(ui.item.mail); $('input#user_mail').val(ui.item.mail);
$('select#user_auth_source_id option').each(function(){ $('select#user_auth_source_id option').each(function(){
if ($(this).attr('value') == ui.item.auth_source_id) { if ($(this).attr('value') == ui.item.auth_source_id) {
$(this).attr('selected', true); $(this).prop('selected', true);
$('select#user_auth_source_id').trigger('change'); $('select#user_auth_source_id').trigger('change');
} }
}); });

8
public/javascripts/application.js
View File

@@ -177,7 +177,7 @@ function buildFilterRow(field, operator, values) {
select = tr.find('td.operator select'); select = tr.find('td.operator select');
for (i = 0; i < operators.length; i++) { for (i = 0; i < operators.length; i++) {
var option = $('<option>').val(operators[i]).text(operatorLabels[operators[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.append(option);
} }
select.change(function(){ toggleOperator(field); }); select.change(function(){ toggleOperator(field); });
@@ -198,7 +198,7 @@ function buildFilterRow(field, operator, values) {
var option = $('<option>'); var option = $('<option>');
if ($.isArray(filterValue)) { if ($.isArray(filterValue)) {
option.val(filterValue[1]).text(filterValue[0]); 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) { if (filterValue.length == 3) {
var optgroup = select.find('optgroup').filter(function(){return $(this).attr('label') == filterValue[2]}); var optgroup = select.find('optgroup').filter(function(){return $(this).attr('label') == filterValue[2]});
if (!optgroup.length) {optgroup = $('<optgroup>').attr('label', filterValue[2]);} if (!optgroup.length) {optgroup = $('<optgroup>').attr('label', filterValue[2]);}
@@ -206,7 +206,7 @@ function buildFilterRow(field, operator, values) {
} }
} else { } else {
option.val(filterValue).text(filterValue); 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); select.append(option);
} }
@@ -240,7 +240,7 @@ function buildFilterRow(field, operator, values) {
var filterValue = filterValues[i]; var filterValue = filterValues[i];
var option = $('<option>'); var option = $('<option>');
option.val(filterValue[1]).text(filterValue[0]); 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); select.append(option);
} }
break; break;