From 0f3e6ca67665b274156d87ff80472346203e5bdd Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 1 Apr 2014 17:58:56 -0700 Subject: [PATCH 1/4] [ticket/12342] Use prop() instead of attr() for boolean properties PHPBB3-12342 --- phpBB/assets/javascript/core.js | 4 ++-- phpBB/styles/prosilver/template/ajax.js | 2 +- phpBB/styles/prosilver/template/ucp_notifications.html | 2 +- phpBB/styles/subsilver2/template/ucp_notifications.html | 2 +- 4 files changed, 5 insertions(+), 5 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); } } }; diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 1d70adc48d..43f6dee9a5 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -373,7 +373,7 @@ $('#quick-mod-select').change(function () { }); $('#delete_permanent').click(function () { - if ($(this).attr('checked')) { + if ($(this).prop('checked')) { $('#delete_reason').hide(); } else { $('#delete_reason').show(); diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 6a711cfd30..2712e53034 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -115,7 +115,7 @@ {S_HIDDEN_FIELDS} -
{L_MARK_ALL}{L_UNMARK_ALL}
+
{L_MARK_ALL}{L_UNMARK_ALL}
{S_FORM_TOKEN} diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index a8b0d2b896..64e21ec4a6 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -131,7 +131,7 @@ -
{L_MARK_ALL} :: {L_UNMARK_ALL}
+
{L_MARK_ALL} :: {L_UNMARK_ALL}
From 18645aa0693e2ba61cd29dc252afbf5cd446ee67 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 1 Apr 2014 18:00:17 -0700 Subject: [PATCH 2/4] [ticket/12342] Fix Find a member show / hide script PHPBB3-12342 --- phpBB/styles/prosilver/template/ajax.js | 2 +- phpBB/styles/prosilver/template/memberlist_body.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 43f6dee9a5..0d7e0a8ba8 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -389,7 +389,7 @@ $('#delete_permanent').click(function () { */ $('#member_search').click(function () { $('#memberlist_search').slideToggle('fast'); - phpbb.ajax_callbacks.alt_text.call(this); + phpbb.alt_text; // Focus on the username textbox if it's available and displayed if ($('#memberlist_search').is(':visible')) { $('#username').focus(); diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 7ba289cfd6..1ee4ed6e9c 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -30,7 +30,7 @@