Changeset 42104

Timestamp:

11/01/2017 09:03:36 PM (7 years ago)

Author:

westonruter

Message:

Customize: Strip zero padding when setting month to prevent de-selection; add zero-padding for number input fields when blurring.

Amends [42042].
See #42373.
Fixes #42392.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (2 diffs)

trunk/src/wp-admin/js/customize-controls.js

@@ -5578 +5578 @@
                     }
                 } ) );
+
+                // Add zero-padding when blurring field.
+                input.on( 'blur', _.debounce( function() {
+                    if ( ! control.invalidDate ) {
+                        control.populateDateInputs();
+                    }
+                } ) );
             } );
 
@@ -5823 +5830 @@
 
             _.each( control.inputElements, function( element, component ) {
-                if ( 'meridian' === component || parseInt( parsed[ component ], 10 ) !== parseInt( element(), 10 ) ) {
-                    element.set( parsed[ component ] );
+                var value = parsed[ component ]; // This will be zero-padded string.
+
+                // Set month and meridian regardless of focused state since they are dropdowns.
+                if ( 'month' === component || 'meridian' === component ) {
+
+                    // Options in dropdowns are not zero-padded.
+                    value = value.replace( /^0/, '' );
+
+                    element.set( value );
+                } else {
+
+                    value = parseInt( value, 10 );
+                    if ( ! element.element.is( document.activeElement ) ) {
+
+                        // Populate element with zero-padded value if not focused.
+                        element.set( parsed[ component ] );
+                    } else if ( value !== parseInt( element(), 10 ) ) {
+
+                        // Forcibly update the value if its underlying value changed, regardless of zero-padding.
+                        element.set( String( value ) );
+                    }
                 }
             } );