Changeset 33348

Timestamp:

07/21/2015 10:08:38 PM (9 years ago)

Author:

iseulde

Message:

Publish box: apply changes post.js to comment.js

See [22250], [27035], [24046], [33340] and [33341].
Fixes #33063.

Location:

trunk/src

Files:

• wp-admin/js/comment.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/js/comment.js

@@ -4 +4 @@
     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'),
+        stamp = $('#timestamp').html();
+
+    $timestampdiv.siblings('a.edit-timestamp').click( function( event ) {
+        if ( $timestampdiv.is( ':hidden' ) ) {
+            $timestampdiv.slideDown('fast');
+            $('#mm').focus();
+            $(this).hide();
         }
-        return false;
+        event.preventDefault();
     });
 
-    $('.cancel-timestamp').click(function() {
-        $('#timestampdiv').slideUp('normal');
+    $timestampdiv.find('.cancel-timestamp').click( function( event ) {
+        $timestampdiv.slideUp('fast').siblings('a.edit-timestamp').show().focus();
         $('#mm').val($('#hidden_mm').val());
         $('#jj').val($('#hidden_jj').val());
@@ -21 +24 @@
         $('#mn').val($('#hidden_mn').val());
         $('#timestamp').html(stamp);
-        $('.edit-timestamp').show();
-        return false;
+        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;
+            $timestampdiv.find('.timestamp-wrap').addClass('form-invalid');
+            return;
         } else {
-            $('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid');
+            $timestampdiv.find('.timestamp-wrap').removeClass('form-invalid');
         }
 
-        $('#timestampdiv').slideUp('normal');
-        $('.edit-timestamp').show();
         $('#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;
+
+        $timestampdiv.slideUp('fast');
+        $timestampdiv.siblings('a.edit-timestamp').show();
     });
 });

trunk/src/wp-includes/script-loader.php

@@ -524 +524 @@
         $scripts->add_data( 'comment', 'group', 1 );
         did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
-            'submittedOn' => __('Submitted on:')
+            'submittedOn' => __( 'Submitted on:' ),
+            /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+            'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
         ) );