Ticket #52664: 52664-2.diff

trunk/wp-includes/js/dist/components.js

@@ -35679 +35679 @@
           currentDate = _this$props2.currentDate,
           isInvalidDate = _this$props2.isInvalidDate;
       var momentDate = this.getMomentDate(currentDate);
+      let mmyyFormat = 'MMMM YYYY';
+      if ('y' === this.props.orderYMD[0]) {
+        mmyyFormat = 'YYYY' + ('string' == typeof this.props.suffixYMD[1] && ' ' !== this.props.suffixYMD[1] ? this.props.suffixYMD[1]: ' ') + 'MMMM';
+      }
       return Object(external_wp_element_["createElement"])("div", {
         className: "components-datetime__date",
         ref: this.nodeRef
       }, Object(external_wp_element_["createElement"])(DayPickerSingleDateController_default.a, {
+        monthFormat: mmyyFormat,
         date: momentDate,
         daySize: 30,
         focused: true,
@@ -35838 +35843 @@
  *
  * @param {Object}                props             Component props.
  * @param {boolean}               props.is12Hour    Should the time picker showed in 12 hour format or 24 hour format.
+ * @param {String}                props.orderYMD    The order of dates such as "mdy" or "ymd".
+ * @param {Array}                 props.suffixYMD   The array containing date formats and their separators.
  * @param {WPValidDateTimeFormat} props.currentTime The initial current time the time picker should render.
  * @param {Function}              props.onChange    Callback function when the date changed.
  */
@@ -35845 +35852 @@
 
 function TimePicker(_ref2) {
   var is12Hour = _ref2.is12Hour,
+      orderYMD = _ref2.orderYMD,
+      suffixYMD = _ref2.suffixYMD,
       currentTime = _ref2.currentTime,
       onChange = _ref2.onChange;
 
@@ -35960 +35969 @@
   }, Object(external_wp_i18n_["__"])('November')), Object(external_wp_element_["createElement"])("option", {
     value: "12"
   }, Object(external_wp_i18n_["__"])('December'))));
-  var dayMonthFormat = is12Hour ? Object(external_wp_element_["createElement"])(external_wp_element_["Fragment"], null, dayFormat, monthFormat) : Object(external_wp_element_["createElement"])(external_wp_element_["Fragment"], null, monthFormat, dayFormat);
-  return Object(external_wp_element_["createElement"])("div", {
-    className: classnames_default()('components-datetime__time')
-  }, Object(external_wp_element_["createElement"])("fieldset", null, Object(external_wp_element_["createElement"])("legend", {
-    className: "components-datetime__time-legend invisible"
-  }, Object(external_wp_i18n_["__"])('Date')), Object(external_wp_element_["createElement"])("div", {
-    className: "components-datetime__time-wrapper"
-  }, dayMonthFormat, Object(external_wp_element_["createElement"])("div", {
-    className: "components-datetime__time-field components-datetime__time-field-year"
-  }, Object(external_wp_element_["createElement"])(UpdateOnBlurAsIntegerField, {
+  var leftSideFormat = (-1 !== orderYMD.indexOf('dm')) ? Object(external_wp_element_["createElement"])(external_wp_element_["Fragment"], null, dayFormat, monthFormat) : Object(external_wp_element_["createElement"])(external_wp_element_["Fragment"], null, monthFormat, dayFormat);
+  var rightSideFormat = Object(external_wp_element_["createElement"])("div", {className: "components-datetime__time-field components-datetime__time-field-year"}, Object(external_wp_element_["createElement"])(UpdateOnBlurAsIntegerField, {
     "aria-label": Object(external_wp_i18n_["__"])('Year'),
     className: "components-datetime__time-field-year-input",
     type: "number",
@@ -35979 +35980 @@
     max: 9999,
     value: year,
     onUpdate: update
-  })))), Object(external_wp_element_["createElement"])("fieldset", null, Object(external_wp_element_["createElement"])("legend", {
+  }));
+  var leftSeparator = "";
+  var rightSeparator = "";
+  if ('y' == orderYMD[0]) {
+    let ph = leftSideFormat;
+    leftSideFormat = rightSideFormat;
+    rightSideFormat = ph;
+    let suffixStyle = {
+      'line-height': '2.5',
+      'padding-right': 3
+    };
+    if ('string' === typeof suffixYMD[1] && '' !== suffixYMD[1]) {
+      leftSeparator = Object(external_wp_element_["createElement"])("div", {
+        style: suffixStyle,
+        "aria-hidden": "true"
+      }, suffixYMD[1]);
+    }
+    if ('d' == orderYMD[2] && 'string' === typeof suffixYMD[3] && '' !== suffixYMD[3]) {
+      rightSeparator = Object(external_wp_element_["createElement"])("div", {
+        style: suffixStyle,
+        "aria-hidden": "true"
+      }, suffixYMD[3]);
+    }
+  }
+  return Object(external_wp_element_["createElement"])("div", {
+    className: classnames_default()('components-datetime__time')
+  }, Object(external_wp_element_["createElement"])("fieldset", null, Object(external_wp_element_["createElement"])("legend", {
     className: "components-datetime__time-legend invisible"
+  }, Object(external_wp_i18n_["__"])('Date')), Object(external_wp_element_["createElement"])("div", {
+    className: "components-datetime__time-wrapper"
+  }, leftSideFormat, leftSeparator, rightSideFormat, rightSeparator)), Object(external_wp_element_["createElement"])("fieldset", null, Object(external_wp_element_["createElement"])("legend", {
+    className: "components-datetime__time-legend invisible"
   }, Object(external_wp_i18n_["__"])('Time')), Object(external_wp_element_["createElement"])("div", {
     className: "components-datetime__time-wrapper"
   }, Object(external_wp_element_["createElement"])("div", {
@@ -36052 +36083 @@
 function DateTimePicker(_ref, ref) {
   var currentDate = _ref.currentDate,
       is12Hour = _ref.is12Hour,
+      orderYMD = _ref.orderYMD,
+      suffixYMD = _ref.suffixYMD,
       isInvalidDate = _ref.isInvalidDate,
       onMonthPreviewed = _ref.onMonthPreviewed,
       onChange = _ref.onChange,
@@ -36072 +36105 @@
   }, !calendarHelpIsVisible && Object(external_wp_element_["createElement"])(external_wp_element_["Fragment"], null, Object(external_wp_element_["createElement"])(time, {
     currentTime: currentDate,
     onChange: onChange,
-    is12Hour: is12Hour
+    is12Hour: is12Hour,
+    orderYMD: orderYMD,
+    suffixYMD: suffixYMD
   }), Object(external_wp_element_["createElement"])(date_time_date, {
     currentDate: currentDate,
     onChange: onChange,
     isInvalidDate: isInvalidDate,
     onMonthPreviewed: onMonthPreviewed,
-    events: events
+    events: events,
+    orderYMD: orderYMD,
+    suffixYMD: suffixYMD
   })), calendarHelpIsVisible && Object(external_wp_element_["createElement"])(external_wp_element_["Fragment"], null, Object(external_wp_element_["createElement"])("div", {
     className: "components-datetime__calendar-help"
   }, Object(external_wp_element_["createElement"])("h4", null, Object(external_wp_i18n_["__"])('Click to Select')), Object(external_wp_element_["createElement"])("ul", null, Object(external_wp_element_["createElement"])("li", null, Object(external_wp_i18n_["__"])('Click the right or left arrows to select other months in the past or the future.')), Object(external_wp_element_["createElement"])("li", null, Object(external_wp_i18n_["__"])('Click the desired day to select it.'))), Object(external_wp_element_["createElement"])("h4", null, Object(external_wp_i18n_["__"])('Navigating with a keyboard')), Object(external_wp_element_["createElement"])("ul", null, Object(external_wp_element_["createElement"])("li", null, Object(external_wp_element_["createElement"])("abbr", {

trunk/wp-includes/js/dist/editor.js

@@ -861 +861 @@
                         // Using offsetHeight as a replacement for computed.height in IE, because IE does not account use of border-box
                         var actualHeight = computed.boxSizing === 'content-box' ? Math.round(parseFloat(computed.height)) : ta.offsetHeight;
 
-                        // The actual height not matching the style height (set via the resize method) indicates that 
+                        // The actual height not matching the style height (set via the resize method) indicates that
                         // the max-height has been exceeded, in which case the overflow should be allowed.
                         if (actualHeight < styleHeight) {
                                 if (computed.overflowY === 'hidden') {
@@ -9419 +9419 @@
   .split('').reverse().join('') // Reverse the string and test for "a" not followed by a slash
   );
 
+  var orderYMD = settings.formats.date.replace(/[^YyFMmndj]/g, '')
+  .replace('Y', 'y')
+  .replace(/[FMn]/, 'm')
+  .replace('j', 'd');
+
+  var suffixYMD = settings.formats.date.match(/[YyFMmndj](.*)[YyFMmndj](.*)[YyFMmndj](.*)/);
+
   function onChange(newDate) {
     onUpdateDate(newDate);
     var ownerDocument = ref.current.ownerDocument;
@@ -9429 +9436 @@
     ref: ref,
     currentDate: date,
     onChange: onChange,
-    is12Hour: is12HourTime
+    is12Hour: is12HourTime,
+    orderYMD: orderYMD,
+    suffixYMD: suffixYMD
   });
 }
 /* harmony default export */ var post_schedule = (Object(external_wp_compose_["compose"])([Object(external_wp_data_["withSelect"])(function (select) {