<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15757] trunk/wp-admin: Update via ajax the sample output of custom date/
times on options-general.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15757">15757</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-08 03:29:57 +0000 (Fri, 08 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update via ajax the sample output of custom date/times on options-general. fixes <a href="http://trac.wordpress.org/ticket/12636">#12636</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (15756 => 15757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-10-08 02:35:06 UTC (rev 15756)
+++ trunk/wp-admin/admin-ajax.php 2010-10-08 03:29:57 UTC (rev 15757)
</span><span class="lines">@@ -1463,6 +1463,12 @@
</span><span class="cx"> }
</span><span class="cx"> die( '0' );
</span><span class="cx"> break;
</span><ins>+case 'date_format' :
+ die( date_i18n( sanitize_option( 'date_format', $_POST['date'] ) ) );
+ break;
+case 'time_format' :
+ die( date_i18n( sanitize_option( 'time_format', $_POST['date'] ) ) );
+ break;
</ins><span class="cx"> default :
</span><span class="cx"> do_action( 'wp_ajax_' . $_POST['action'] );
</span><span class="cx"> die('0');
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (15756 => 15757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-10-08 02:35:06 UTC (rev 15756)
+++ trunk/wp-admin/options-general.php 2010-10-08 03:29:57 UTC (rev 15757)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> jQuery(document).ready(function($){
</span><span class="cx"> $("input[name='date_format']").click(function(){
</span><span class="cx"> if ( "date_format_custom_radio" != $(this).attr("id") )
</span><del>- $("input[name='date_format_custom']").val( $(this).val() );
</del><ins>+ $("input[name='date_format_custom']").val( $(this).val() ).siblings('.example').text( $(this).siblings('span').text() );
</ins><span class="cx"> });
</span><span class="cx"> $("input[name='date_format_custom']").focus(function(){
</span><span class="cx"> $("#date_format_custom_radio").attr("checked", "checked");
</span><span class="lines">@@ -38,11 +38,19 @@
</span><span class="cx">
</span><span class="cx"> $("input[name='time_format']").click(function(){
</span><span class="cx"> if ( "time_format_custom_radio" != $(this).attr("id") )
</span><del>- $("input[name='time_format_custom']").val( $(this).val() );
</del><ins>+ $("input[name='time_format_custom']").val( $(this).val() ).siblings('.example').text( $(this).siblings('span').text() );
</ins><span class="cx"> });
</span><span class="cx"> $("input[name='time_format_custom']").focus(function(){
</span><span class="cx"> $("#time_format_custom_radio").attr("checked", "checked");
</span><span class="cx"> });
</span><ins>+ $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
+ var format = $(this);
+ format.siblings('img').css('visibility','visible');
+ $.post(ajaxurl, {
+ action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
+ date : format.val(),
+ }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
+ });
</ins><span class="cx"> });
</span><span class="cx"> //]]>
</span><span class="cx"> </script>
</span><span class="lines">@@ -265,14 +273,14 @@
</span><span class="cx"> echo " checked='checked'";
</span><span class="cx"> $custom = false;
</span><span class="cx"> }
</span><del>- echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
</del><ins>+ echo ' /> <span>' . date_i18n( $format ) . "</span></label><br />\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo ' <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
</span><span class="cx"> checked( $custom );
</span><del>- echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> ' . date_i18n( get_option('date_format') ) . "\n";
</del><ins>+ echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
</ins><span class="cx">
</span><del>- echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click &#8220;Save Changes&#8221; to update sample output.') . "</p>\n";
</del><ins>+ echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
</ins><span class="cx"> ?>
</span><span class="cx"> </fieldset>
</span><span class="cx"> </td>
</span><span class="lines">@@ -297,12 +305,13 @@
</span><span class="cx"> echo " checked='checked'";
</span><span class="cx"> $custom = false;
</span><span class="cx"> }
</span><del>- echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
</del><ins>+ echo ' /> <span>' . date_i18n( $format ) . "</span></label><br />\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo ' <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
</span><span class="cx"> checked( $custom );
</span><del>- echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> ' . date_i18n( get_option('time_format') ) . "\n";
</del><ins>+ echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
+
</ins><span class="cx"> ?>
</span><span class="cx"> </fieldset>
</span><span class="cx"> </td>
</span></span></pre>
</div>
</div>
</body>
</html>