summaryrefslogtreecommitdiffstats
path: root/public/javascripts
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-08-13 23:28:36 +0000
committerGo MAEDA <maeda@farend.jp>2019-08-13 23:28:36 +0000
commit3bf7956ce00fd60f8bfa84c47b67fa2f52bcff6f (patch)
tree375b148d8c9e694a79e584545889eb0e325c1061 /public/javascripts
parente2a00d2dc81213d1d7f546a7cc3093f362f1a9df (diff)
downloadredmine-3bf7956ce00fd60f8bfa84c47b67fa2f52bcff6f.tar.gz
redmine-3bf7956ce00fd60f8bfa84c47b67fa2f52bcff6f.zip
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
Diffstat (limited to 'public/javascripts')
-rw-r--r--public/javascripts/application.js8
1 files changed, 4 insertions, 4 deletions
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;