diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-19 10:34:21 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-19 14:24:59 +0200 |
| commit | d099ef8cade0194fa8056439d489b159d5890f29 (patch) | |
| tree | 57626731c8f3c4fb3f8951b3aa789c85328388c1 /phpBB/assets | |
| parent | 81627e2888ac0987c941775276a720c2aa7fe142 (diff) | |
| download | forums-d099ef8cade0194fa8056439d489b159d5890f29.tar forums-d099ef8cade0194fa8056439d489b159d5890f29.tar.gz forums-d099ef8cade0194fa8056439d489b159d5890f29.tar.bz2 forums-d099ef8cade0194fa8056439d489b159d5890f29.tar.xz forums-d099ef8cade0194fa8056439d489b159d5890f29.zip | |
[feature/new-tz-handling] Display suggestion when a different value is selected
PHPBB3-9558
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index f07a245307..c40852388e 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -420,6 +420,12 @@ phpbb.timezone_switch_date = function(keep_selection) { $('#timezone > optgroup').css('display', 'none'); $("#timezone > optgroup[label='" + $('#tz_date').val() + "']").css('display', 'block'); + if ($('#tz_date').val() == $('#tz_select_date_suggest').attr('data-suggested-tz')) { + $('#tz_select_date_suggest').css('display', 'none'); + } else { + $('#tz_select_date_suggest').css('display', 'inline'); + } + 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); @@ -485,10 +491,12 @@ phpbb.timezone_preselect_select = function(force_selector) { $('#tz_select_date_suggest').css('display', 'inline'); $('#tz_select_date_suggest').attr('title', $('#tz_select_date_suggest').attr('data-l-suggestion').replace("%s", option.innerHTML)); $('#tz_select_date_suggest').attr('value', $('#tz_select_date_suggest').attr('data-l-suggestion').replace("%s", option.innerHTML.substring(0, 9))); + $('#tz_select_date_suggest').attr('data-suggested-tz', option.innerHTML); phpbb.timezone_switch_date(true); } else { option.selected = true; phpbb.timezone_switch_date(!force_selector); + $('#tz_select_date_suggest').attr('data-suggested-tz', option.innerHTML); $('#tz_select_date_suggest').css('display', 'none'); } break; |