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

Author: iivashchenko

lib/web/mage/calendar.js

@@ -23,6 +23,24 @@
 
     var calendarBasePrototype;
 
+    /**
+     * Get date/time according to store settings
+     * @returns {Date}
+     */
+    function getTimezoneDate() {
+        // Get local time in ms
+        var ms = Date.now(),
+            options = $.calendarConfig ? $.calendarConfig : {};
+
+        // Use store timestamp based on store timezone settings
+        if (typeof options.serverTimezoneSeconds !== 'undefined') {
+            //Adjust milliseconds according to client local timezone offset
+            ms = (options.serverTimezoneSeconds + new Date().getTimezoneOffset() * 60) * 1000;
+        }
+
+        return new Date(ms);
+    }
+
     $.datepicker.markerClassName = '_has-datepicker';
 
     /**
@@ -72,8 +90,6 @@
          * Wrapper for overwrite jQuery UI datepicker function.
          */
         _overwriteGenerateHtml: function () {
-            var self = this;
-
             /**
              * Overwrite jQuery UI datepicker function.
              * Reason: magento date could be set before calendar show
@@ -83,7 +99,7 @@
              * @return {String} html template
              */
             $.datepicker.constructor.prototype._generateHTML = function (inst) {
-                var today = self.getTimezoneDate(),
+                var today = getTimezoneDate(),
                     isRTL = this._get(inst, 'isRTL'),
                     showButtonPanel = this._get(inst, 'showButtonPanel'),
                     hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext'),
@@ -316,32 +332,14 @@
             };
         },
 
-        /**
-         * If server timezone is defined then take to account server timezone shift
-         * @return {Object} date
-         */
-        getTimezoneDate: function () {
-
-            // Get local time in ms
-            var ms = Date.now();
-
-            // Use store timestamp based on store timezone settings
-            if (typeof this.options.serverTimezoneSeconds !== 'undefined') {
-                //Adjust milliseconds according to client local timezone offset
-                ms = (this.options.serverTimezoneSeconds + new Date().getTimezoneOffset() * 60) * 1000;
-            }
-
-            return new Date(ms);
-        },
-
         /**
          * Set current date if the date is not set
          * @protected
          * @param {Object} element
          */
         _setCurrentDate: function (element) {
             if (!element.val()) {
-                element[this._picker()]('setDate', this.getTimezoneDate())
+                element[this._picker()]('setDate', getTimezoneDate())
                     .val('');
             }
         },
@@ -356,6 +354,7 @@
                 pickerButtonText = picker.next('.ui-datepicker-trigger')
                     .find('img')
                     .attr('title');
+
             picker.next('.ui-datepicker-trigger')
                 .addClass('v-middle')
                 .text('') // Remove jQuery UI datepicker generated image
@@ -523,8 +522,8 @@
     $.datepicker._gotoToday = function (el) {
         var pickerObject = $(el);
 
-        // Set date/time according to timezone offset        
-        pickerObject.datepicker( "setDate", pickerObject.calendar("getTimezoneDate") )
+        //Set date/time according to timezone offset
+        pickerObject.datepicker('setDate', getTimezoneDate())
             // To ensure that user can re-select date field without clicking outside it first.
             .blur();
     };