Merge branch 'MAGETWO-53299' of github.com:magento-vanilla/magento2ce into PR

Author: omiroshnichenko

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -51,6 +51,7 @@ require([
             showHour: false,
             showMinute: false,
             serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
+            serverTimezoneOffset: <?php echo (int) $block->getTimezoneOffsetSeconds(); ?>,
             yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });

dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js

@@ -58,6 +58,18 @@ CalendarTest.prototype.testWithServerTimezoneOffset = function() {
     assertEquals(true, currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
     calendar.calendar('destroy');
 };
+CalendarTest.prototype.testWithServerTimezoneShift = function() {
+    /*:DOC += <input type="text" id="calendar" /> */
+    var serverTimezoneOffset = 43200,
+        calendar = $('#calendar').calendar({serverTimezoneOffset: serverTimezoneOffset}),
+        currentDate = new Date();
+
+    setTimeout(function () {
+        currentDate.setTime(currentDate.getTime() + (serverTimezoneOffset + currentDate.getTimezoneOffset() * 60) * 1000);
+        assertEquals(true, currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
+        calendar.calendar('destroy');
+    }, 61000);
+};
 CalendarTest.prototype.testWithoutServerTimezoneOffset = function() {
     /*:DOC += <input type="text" id="calendar" /> */
     var calendar = $('#calendar').calendar(),

lib/web/mage/calendar.js

@@ -21,10 +21,49 @@
 }(function ($) {
     'use strict';
 
-    var calendarBasePrototype;
+    var calendarBasePrototype,
+        datepickerPrototype = $.datepicker.constructor.prototype;
 
     $.datepicker.markerClassName = '_has-datepicker';
 
+    /**
+     * Extend JQuery date picker prototype with store local time methods
+     */
+    $.extend(datepickerPrototype, {
+        /**
+         * 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}
+         */
+        _getTimezoneDate: function (options) {
+            // local time in ms
+            var ms = Date.now();
+
+            options = options || $.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);
+        },
+
+        /**
+         * Set date/time according to store settings.
+         * @param {String|Object} target - the target input field or division or span
+         */
+        _setTimezoneDateDatepicker: function (target) {
+            this._setDateDatepicker(target, this._getTimezoneDate());
+        }
+    });
+
     /**
      * Widget calendar
      */
@@ -72,8 +111,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 +120,7 @@
              * @return {String} html template
              */
             $.datepicker.constructor.prototype._generateHTML = function (inst) {
-                var today = self.getTimezoneDate(),
+                var today = this._getTimezoneDate(),
                     isRTL = this._get(inst, 'isRTL'),
                     showButtonPanel = this._get(inst, 'showButtonPanel'),
                     hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext'),
@@ -316,33 +353,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())
-                    .val('');
+                element[this._picker()]('setTimezoneDate').val('');
             }
         },
 
@@ -356,6 +374,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
@@ -369,6 +388,15 @@
         _destroy: function () {
             this.element[this._picker()]('destroy');
             this._super();
+        },
+
+        /**
+         * Method is kept for backward compatibility and unit-tests acceptance
+         * see \mage\calendar\calendar-test.js
+         * @return {Object} date
+         */
+        getTimezoneDate: function () {
+            return datepickerPrototype._getTimezoneDate.call(this, this.options);
         }
     });
 
@@ -521,10 +549,8 @@
      * @param {Object} el
      */
     $.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
+        $(el).datepicker('setTimezoneDate')
             // To ensure that user can re-select date field without clicking outside it first.
             .blur();
     };