Changeset 42134

Timestamp:

11/09/2017 03:54:13 AM (7 years ago)

Author:

westonruter

Message:

Settings: Fix date/time format previewing.

Props afercia.
Amends [41857].
Fixes #41603.

Location:

trunk/src/wp-admin

Files:

• css/forms.css (modified) (1 diff)
• includes/options.php (modified) (3 diffs)

trunk/src/wp-admin/css/forms.css

@@ -898 +898 @@
 .options-general-php .spinner {
     float: none;
-    margin: 0 3px;
+    margin: -3px 3px 0;
 }
 

trunk/src/wp-admin/includes/options.php

@@ -52 +52 @@
         $("input[name='date_format']").click(function(){
             if ( "date_format_custom_radio" != $(this).attr("id") )
-                $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+                $( 'input[name="date_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
         });
         $( 'input[name="date_format_custom"]' ).on( 'click input', function() {
@@ -60 +60 @@
         $("input[name='time_format']").click(function(){
             if ( "time_format_custom_radio" != $(this).attr("id") )
-                $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+                $( 'input[name="time_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
         });
         $( 'input[name="time_format_custom"]' ).on( 'click input', function() {
@@ -66 +66 @@
         });
         $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
-            var format = $(this);
-            format.siblings( '.spinner' ).addClass( 'is-active' );
-            $.post(ajaxurl, {
-                    action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
+            var format = $( this ),
+                fieldset = format.closest( 'fieldset' ),
+                example = fieldset.find( '.example' ),
+                spinner = fieldset.find( '.spinner' );
+
+            spinner.addClass( 'is-active' );
+
+            $.post( ajaxurl, {
+                    action: 'date_format_custom' == format.attr( 'name' ) ? 'date_format' : 'time_format',
                     date : format.val()
-                }, function(d) { format.siblings( '.spinner' ).removeClass( 'is-active' ); format.siblings('.example').text(d); } );
+                }, function( d ) { spinner.removeClass( 'is-active' ); example.text( d ); } );
         });