diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-04 18:00:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-04 18:00:44 +0200 |
| commit | e00a4b411d7723447d140c8ea18f9d9b812a3776 (patch) | |
| tree | 02b586ba4fd532013ccbad53bea86e71b46c179f /phpBB/assets/javascript/core.js | |
| parent | 9bfada03f3c9ee322d91a5c5e390b70afbf44016 (diff) | |
| parent | 0c25c60381d09bd8f878b55ea376fd2928affc7d (diff) | |
| download | forums-e00a4b411d7723447d140c8ea18f9d9b812a3776.tar forums-e00a4b411d7723447d140c8ea18f9d9b812a3776.tar.gz forums-e00a4b411d7723447d140c8ea18f9d9b812a3776.tar.bz2 forums-e00a4b411d7723447d140c8ea18f9d9b812a3776.tar.xz forums-e00a4b411d7723447d140c8ea18f9d9b812a3776.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12342' into develop-ascraeus
* vsephpbb/ticket/12342:
[ticket/12342] Remove spinner and fix useage of ajax on memberlist
[ticket/12342] Fix the Custom Dates function in UCP Prefs Global
[ticket/12342] Fix Find a member show / hide script
[ticket/12342] Use prop() instead of attr() for boolean properties
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 4657af90ab..aa9dc9af82 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -431,14 +431,14 @@ phpbb.timezoneSwitchDate = function(keepSelection) { if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() === 1) { // If there is only one timezone for the selected date, we just select that automatically. - $("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr('selected', true); + $("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").prop('selected', true); keepSelection = true; } if (typeof keepSelection !== 'undefined' && !keepSelection) { var timezoneOptions = $('#timezone > optgroup option'); if (timezoneOptions.filter(':selected').length <= 0) { - timezoneOptions.filter(':first').attr('selected', true); + timezoneOptions.filter(':first').prop('selected', true); } } }; |