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 | |
| 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')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_prefs_personal.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_notifications.html | 2 |
5 files changed, 7 insertions, 7 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..9688802929 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(); @@ -389,7 +389,7 @@ $('#delete_permanent').click(function () { */ $('#member_search').click(function () { $('#memberlist_search').slideToggle('fast'); - phpbb.ajax_callbacks.alt_text.call(this); + phpbb.ajaxCallbacks.alt_text.call(this); // 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/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 @@ <input type="hidden" name="form_time" value="{FORM_TIME}" /> {S_HIDDEN_FIELDS} <input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" /> - <div><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></div> + <div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div> {S_FORM_TOKEN} </fieldset> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 8111496dcb..a5b4852af8 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -117,7 +117,7 @@ } } - customDates(); + window.onload = customDates; // ]]> </script> 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 @@ <!-- ENDIF --> <!-- IF .notifications --> -<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></b></div> +<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></b></div> <!-- ENDIF --> </form> |