Merge pull request #682 from magento-fearless-kiwis/FearlessKiwis-MAG…

…ETWO-62262 Fearless kiwis magetwo 62262
magento · Dec 19, 2016 · 813fad8 · 813fad8
2 parents 383d18a + c7e851c
commit 813fad8
Show file tree

Hide file tree

Showing 6 changed files with 685 additions and 667 deletions.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -167,38 +167,22 @@ define([
         prepareDateTimeFormats: function () {
             this.pickerDateTimeFormat = this.options.dateFormat;
             this.momentFormat = this.options.dateFormat ?
-                this.convertToMomentFormat(this.options.dateFormat) : this.momentFormat;
+                    utils.convertToMomentFormat(this.options.dateFormat) : this.momentFormat;
 
             if (this.options.showsTime) {
                 this.pickerDateTimeFormat += ' ' + this.options.timeFormat;
             }
 
-            this.pickerDateTimeFormat = utils.normalizeDate(this.pickerDateTimeFormat);
+            this.pickerDateTimeFormat = utils.convertToMomentFormat(this.pickerDateTimeFormat);
 
             if (this.dateFormat) {
                 this.inputDateFormat = this.dateFormat;
             }
 
-            this.inputDateFormat = utils.normalizeDate(this.inputDateFormat);
-            this.outputDateFormat = utils.normalizeDate(this.outputDateFormat);
+            this.inputDateFormat = utils.convertToMomentFormat(this.inputDateFormat);
+            this.outputDateFormat = utils.convertToMomentFormat(this.outputDateFormat);
 
             this.validationParams.dateFormat = this.outputDateFormat;
-        },
-
-        /**
-         * Converts PHP IntlFormatter format to moment format.
-         *
-         * @param {String} format - PHP format
-         * @returns {String} - moment compatible formatting
-         */
-        convertToMomentFormat: function (format) {
-            var newFormat;
-
-            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
-            newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the date
-            newFormat = newFormat.replace(/mm|m/gi, 'MM'); //replace the month
-
-            return newFormat;
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js
@@ -53,7 +53,7 @@ define([
                 'setDate',
                 moment(
                     observable(),
-                    utils.normalizeDate(
+                    utils.convertToMomentFormat(
                         options.dateFormat + (options.showsTime ? ' ' + options.timeFormat : '')
                     )
                 ).toDate()