makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/12342' into develop-ascraeus

Browse source 
* 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
This commit is contained in:
Joas Schilling 2014-04-04 18:00:44 +02:00
commit e00a4b411d
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/assets/javascript/core.js
View file

@ -431,14 +431,14 @@ phpbb.timezoneSwitchDate = function(keepSelection) {
if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() === 1) { 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. // 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; keepSelection = true;
} }
if (typeof keepSelection !== 'undefined' && !keepSelection) { if (typeof keepSelection !== 'undefined' && !keepSelection) {
var timezoneOptions = $('#timezone > optgroup option'); var timezoneOptions = $('#timezone > optgroup option');
if (timezoneOptions.filter(':selected').length <= 0) { if (timezoneOptions.filter(':selected').length <= 0) {
timezoneOptions.filter(':first').attr('selected', true); timezoneOptions.filter(':first').prop('selected', true);
} }
} }
}; };

4
phpBB/styles/prosilver/template/ajax.js
View file

@ -373,7 +373,7 @@ $('#quick-mod-select').change(function () {
}); });
$('#delete_permanent').click(function () { $('#delete_permanent').click(function () {
if ($(this).attr('checked')) { if ($(this).prop('checked')) {
$('#delete_reason').hide(); $('#delete_reason').hide();
} else { } else {
$('#delete_reason').show(); $('#delete_reason').show();
@ -389,7 +389,7 @@ $('#delete_permanent').click(function () {
*/ */
$('#member_search').click(function () { $('#member_search').click(function () {
$('#memberlist_search').slideToggle('fast'); $('#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 // Focus on the username textbox if it's available and displayed
if ($('#memberlist_search').is(':visible')) { if ($('#memberlist_search').is(':visible')) {
$('#username').focus(); $('#username').focus();

2
phpBB/styles/prosilver/template/ucp_notifications.html
View file

@ -115,7 +115,7 @@
<input type="hidden" name="form_time" value="{FORM_TIME}" /> <input type="hidden" name="form_time" value="{FORM_TIME}" />
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" /> <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> &bull; <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> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/prosilver/template/ucp_prefs_personal.html
View file

@ -117,7 +117,7 @@
} }
} }
customDates(); window.onload = customDates;
// ]]> // ]]>
</script> </script>

2
phpBB/styles/subsilver2/template/ucp_notifications.html
View file

@ -131,7 +131,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .notifications --> <!-- 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 --> <!-- ENDIF -->
</form> </form>