MAGETWO-53299: "Go Today" button is not working for dates range component

Author: iivashchenko

lib/web/mage/calendar.js

@@ -26,43 +26,34 @@
 
     $.datepicker.markerClassName = '_has-datepicker';
 
-    /**
-     * Get date/time according to store settings.
-     * We use serverTimezoneOffset (in seconds) instead of serverTimezoneSeconds
-     * in order to have ability to know actual store time even if page hadn't been reloaded
-     * @returns {Date}
-     */
-    function getTimezoneDate() {
-
-        // local time in ms
-        var ms = Date.now(),
-            options = $.calendarConfig ? $.calendarConfig : {};
-
-        // Adjust milliseconds according to store timezone offset,
-        // mind the GMT zero offset
-        if (typeof options.serverTimezoneOffset !== 'undefined') {
-            // Make UTC time and add store timezone offset in seconds
-            ms += new Date().getTimezoneOffset() * 60 * 1000 + options.serverTimezoneOffset * 1000;
-        } else if (typeof options.serverTimezoneSeconds !== 'undefined') {
-            //Set milliseconds according to client local timezone offset
-            ms = (options.serverTimezoneSeconds + new Date().getTimezoneOffset() * 60) * 1000;
-        }
-
-        return new Date(ms);
-    }
-
     /**
      * Extend JQuery date picker prototype with store local time methods
      */
     $.extend(datepickerPrototype, {
 
         /**
-         * Get date/time according to store settings
+         * Get date/time according to store settings.
+         * We use serverTimezoneOffset (in seconds) instead of serverTimezoneSeconds
+         * in order to have ability to know actual store time even if page hadn't been reloaded
          * @returns {Date}
-         * @private
          */
-        _getTimezoneDate: function () {
-            return getTimezoneDate();
+        _getTimezoneDate: function (options) {
+            // local time in ms
+            var ms = Date.now();
+
+            options = options || $.calendarConfig ? $.calendarConfig : {};
+
+            // Adjust milliseconds according to store timezone offset,
+            // mind the GMT zero offset
+            if (typeof options.serverTimezoneOffset !== 'undefined') {
+                // Make UTC time and add store timezone offset in seconds
+                ms += new Date().getTimezoneOffset() * 60 * 1000 + options.serverTimezoneOffset * 1000;
+            } else if (typeof options.serverTimezoneSeconds !== 'undefined') {
+                //Set milliseconds according to client local timezone offset
+                ms = (options.serverTimezoneSeconds + new Date().getTimezoneOffset() * 60) * 1000;
+            }
+
+            return new Date(ms);
         },
 
         /**
@@ -406,7 +397,7 @@
          * @return {Object} date
          */
         getTimezoneDate: function () {
-            return getTimezoneDate();
+            return datepickerPrototype._getTimezoneDate.call(this, this.options);
         }
     });
 
@@ -559,7 +550,6 @@
      * @param {Object} el
      */
     $.datepicker._gotoToday = function (el) {
-
         //Set date/time according to timezone offset
         $(el).datepicker('setTimezoneDate')
             // To ensure that user can re-select date field without clicking outside it first.