WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / js / comment.js

diff --git a/wp-admin/js/comment.js b/wp-admin/js/comment.js
index b5506ea8e1b323cd464e0998dbadeefffac863f1..d194148f60d704f947d93d098a30844bd23070cb 100644 (file)
--- a/wp-admin/js/comment.js
+++ b/wp-admin/js/comment.js
@@ -1,50 +1,63 @@
-/* global postboxes:true, commentL10n:true */
+/* global postboxes, commentL10n */
 jQuery(document).ready( function($) {
 
        postboxes.add_postbox_toggles('comment');
 
-       var stamp = $('#timestamp').html();
-       $('.edit-timestamp').click(function () {
-               if ($('#timestampdiv').is(':hidden')) {
-                       $('#timestampdiv').slideDown('normal');
-                       $('.edit-timestamp').hide();
+       var $timestampdiv = $('#timestampdiv'),
+               $timestamp = $( '#timestamp' ),
+               stamp = $timestamp.html(),
+               $timestampwrap = $timestampdiv.find( '.timestamp-wrap' ),
+               $edittimestamp = $timestampdiv.siblings( 'a.edit-timestamp' );
+
+       $edittimestamp.click( function( event ) {
+               if ( $timestampdiv.is( ':hidden' ) ) {
+                       $timestampdiv.slideDown( 'fast', function() {
+                               $( 'input, select', $timestampwrap ).first().focus();
+                       } );
+                       $(this).hide();
                }
-               return false;
+               event.preventDefault();
        });
 
-       $('.cancel-timestamp').click(function() {
-               $('#timestampdiv').slideUp('normal');
+       $timestampdiv.find('.cancel-timestamp').click( function( event ) {
+               // Move focus back to the Edit link.
+               $edittimestamp.show().focus();
+               $timestampdiv.slideUp( 'fast' );
                $('#mm').val($('#hidden_mm').val());
                $('#jj').val($('#hidden_jj').val());
                $('#aa').val($('#hidden_aa').val());
                $('#hh').val($('#hidden_hh').val());
                $('#mn').val($('#hidden_mn').val());
-               $('#timestamp').html(stamp);
-               $('.edit-timestamp').show();
-               return false;
+               $timestamp.html( stamp );
+               event.preventDefault();
        });
 
-       $('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
+       $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels
                var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(),
                        newD = new Date( aa, mm - 1, jj, hh, mn );
 
+               event.preventDefault();
+
                if ( newD.getFullYear() != aa || (1 + newD.getMonth()) != mm || newD.getDate() != jj || newD.getMinutes() != mn ) {
-                       $('.timestamp-wrap', '#timestampdiv').addClass('form-invalid');
-                       return false;
+                       $timestampwrap.addClass( 'form-invalid' );
+                       return;
                } else {
-                       $('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid');
+                       $timestampwrap.removeClass( 'form-invalid' );
                }
 
-               $('#timestampdiv').slideUp('normal');
-               $('.edit-timestamp').show();
-               $('#timestamp').html(
+               $timestamp.html(
                        commentL10n.submittedOn + ' <b>' +
-                       $( '#mm option[value="' + mm + '"]' ).text() + ' ' +
-                       jj + ', ' +
-                       aa + ' @ ' +
-                       hh + ':' +
-                       mn + '</b> '
+                       commentL10n.dateFormat
+                               .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
+                               .replace( '%2$s', parseInt( jj, 10 ) )
+                               .replace( '%3$s', aa )
+                               .replace( '%4$s', ( '00' + hh ).slice( -2 ) )
+                               .replace( '%5$s', ( '00' + mn ).slice( -2 ) ) +
+                               '</b> '
                );
-               return false;
+
+               // Move focus back to the Edit link.
+               $edittimestamp.show().focus();
+               $timestampdiv.slideUp( 'fast' );
        });
 });