@oracle/oraclejet 12.0.1 → 12.0.4

package/dist/js/libs/oj/debug/ojdatetimepicker.js

@@ -1272,10 +1272,11 @@ var __oj_input_date_time_metadata =
 
   /**
    * Placed here to avoid duplicate code for ojdatepicker + ojtimepicker
-   *
+   * @static
    * @ignore
    */
-  function getImplicitDateTimeRangeValidator(options, converter, defaultStyleClass) {
+  function getImplicitDateTimeRangeValidator(options, converter,
+    defaultStyleClass) {
     var translationKeys = {
       'oj-inputdatetime': 'datetime',
       'oj-inputtime': 'time',
@@ -1287,6 +1288,7 @@ var __oj_input_date_time_metadata =
       { category: 'messageDetail', entries: ['rangeUnderflow', 'rangeOverflow'] },
       { category: 'messageSummary', entries: ['rangeUnderflow', 'rangeOverflow'] }
     ];
+
     var dateTimeRangeOptions = {
       min: options.min,
       max: options.max,
@@ -1383,6 +1385,33 @@ var __oj_input_date_time_metadata =
     return new ojconverterDatetime.IntlDateTimeConverter({ day: '2-digit', month: '2-digit', year: _yearFormat });
   }
 
+  /**
+   * @static
+   * @private
+   */
+    function _getConverterTimezone(converter) {
+    const converterOptions =
+      converter && converter.resolvedOptions ? converter.resolvedOptions() : null;
+    return converterOptions && converterOptions.timeZone ? converterOptions.timeZone : null;
+  }
+
+  /**
+   * This takes an isoDate and returns the iso date that is local to the place of the timezone,
+   * but without the timezone.
+   * This is useful when you want to show a date of the place in the timezone, like right now
+   * in Hong Kong it may be 1/12/2021 2AM.
+   * @static
+   * @private
+   */
+    function _convertIsoStrFormatLocalWithTimezone(isoDate, converterTimeZone) {
+    // Set up a temporary converter to return an ISO string in converterOptions.timeZone timezone
+      const _localTZConverter = new ojconverterDatetime.IntlDateTimeConverter({
+        timeZone: converterTimeZone,
+        isoStrFormat: 'local'
+      });
+    return _localTZConverter.parse(isoDate);
+  }
+
   /**
    * Bind hover events for datepicker elements.
    * Done via delegate so the binding only occurs once in the lifetime of the parent div.
@@ -2168,10 +2197,13 @@ var __oj_input_date_time_metadata =
        * @ojextension {_COPY_TO_INNER_ELEM: true}
        */
       /**
-       * The maximum selectable date, in ISO string format. For ojDatePicker, this should not contain
-       * a time portion in the ISO string.  If it does, a warning is issued. When set to null, there
-       * is no maximum. min and max must be in the same ISO string format as value (local,
-       * zulu, or offset).
+       * The maximum selectable date, in ISO string format.
+       * <p>
+       * For ojDatePicker, this should be a local
+       * date and not contain a time portion in the ISO string so it can be compared with the value
+       * the user selects. value becomes a local date once the user interacts with the component.
+       * When set to null, there is no minimum.
+       * </p>
        *
        * @expose
        * @instance
@@ -2192,11 +2224,10 @@ var __oj_input_date_time_metadata =
        * myInputDate.max = '2018-09-25';
        */
       /**
-       * The maximum selectable date, in ISO string format. For ojInputDate, this should not contain
-       * a time portion in the ISO string.  If it does, a warning is issued. When set to null, there
-       * is no maximum. min and max must be in the same ISO string format as value (local,
-
-       * zulu, or offset).
+       * The maximum selectable date, in ISO string format. When set to null, there
+       * is no maximum. Since the value becomes a local date with no time once the
+       * user interacts with the component, min/max should be a local date with no time
+       * so they can be compared.
        *
        * @expose
        * @instance
@@ -2218,10 +2249,12 @@ var __oj_input_date_time_metadata =
       max: undefined,
 
       /**
-       * The minium selectable date, in ISO string format. For ojDatePicker, this should not contain
-       * a time portion in the ISO string.  If it does, a warning is issued. When set to null, there
-       * is no minimum. min and max must be in the same ISO string format as value (local,
-       * zulu, or offset).
+       * The minimum selectable date, in ISO string format.
+       * <p> For ojDatePicker, this should be a local
+       * date and not contain a time portion in the ISO string so it can be compared with the value
+       * the user selects. value becomes a local date once the user interacts with the component.
+       * When set to null, there is no minimum.
+       * </p>
        *
        * @expose
        * @instance
@@ -2242,10 +2275,13 @@ var __oj_input_date_time_metadata =
        * myInputDate.min = '2014-08-25';
        */
       /**
-       * The minimum selectable date, in ISO string format. For ojInputDate, this should not contain
-       * a time portion in the ISO string.  If it does, a warning is issued. When set to null, there
-       * is no minimum. min and max must be in the same ISO string format as value (local,
-       * zulu, or offset).
+       * The minimum selectable date, in ISO string format.
+       * <p>
+       * For oj-input-date, this should be a local
+       * date and not contain a time portion in the ISO string so it can be compared with the value
+       * the user selects. value becomes a local date once the user interacts with the component.
+       * When set to null, there is no minimum.
+       * </p>
        *
        * @expose
        * @instance
@@ -2612,8 +2648,6 @@ var __oj_input_date_time_metadata =
        * If needed, use IntlConverterUtils.dateToLocalIsoDateString to convert a Date to
        * a local iso string that contains only the date to set as the initial value.
        * IntlConverterUtils.dateToLocalIsoDateString(new Date(2014, 1, 1)));
-
-       * If a time is provided in the ISOString value, a warning will be issued.
        * </p>
        *
        *
@@ -2744,7 +2778,12 @@ var __oj_input_date_time_metadata =
       childDiv.className = 'oj-datepicker-content';
       dpDiv.appendChild(childDiv);
       this._dpDiv = bindHover($(dpDiv));
-      document.body.appendChild(dpDiv); // @HTMLUpdateOK
+      // Append the dpDiv to the CE wrapper and for widgets simply to the body
+      if (this._IsCustomElement()) {
+        this._dpDiv.appendTo(this.OuterWrapper); // @HTMLUpdateOK
+      } else {
+        this._dpDiv.appendTo(document.body); // @HTMLUpdateOK
+      }
     },
 
     _createPopupDpDiv: function () {
@@ -2810,9 +2849,9 @@ var __oj_input_date_time_metadata =
     _ComponentCreate: function () {
       // verify that the options are set correctly. If they are not an error is thrown
       // and the component will not render.
-      ojconverterutilsI18n.IntlConverterUtils._verifyValueMinMaxNoTime(this.options.value,
-                                                  this.options.min,
-                                                  this.options.max);
+      ojconverterutilsI18n.IntlConverterUtils._verifyValueMinMax(this.options.value,
+                                            this.options.min,
+                                            this.options.max);
 
       // Create all the default converters we need first
       this._CreateConverters();
@@ -2850,8 +2889,6 @@ var __oj_input_date_time_metadata =
         // http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
         this._dpDiv.css('display', 'block');
 
-        this._registerSwipeHandler();
-
         // For this to be accessible, the root dom element needs role/aria-labelledby.
         const rootDomElem = this.widget();
         rootDomElem[0].setAttribute('role', 'group');
@@ -2861,7 +2898,6 @@ var __oj_input_date_time_metadata =
         this._processReadOnlyKeyboardEdit();
         if (this.options.readOnly !== true) {
           this._attachTrigger();
-          this._registerSwipeHandler();
         }
       }
 
@@ -2870,11 +2906,21 @@ var __oj_input_date_time_metadata =
       // passing in true to indicate that we want to show the popup of showOn is set
       // to 'focus'. If this isn't a custom element, we don't want to override the
       // focus functions.
+      // Also, when readonly is true, we just want to focus on the readonly element,
+      // as the popup isn't an issue.
       if (this._IsCustomElement()) {
         let comp = this._getRootElement();
-        let inputElem = this.GetFocusElement();
-        comp.focus = function () {
-          inputElem.focus(true);
+        // We need the input element here regardless of readonly state.
+        let inputElem = this._GetContentElement()[0];
+        comp.focus = () => {
+          const focusElem = this.GetFocusElement();
+          // we only want to call .focus(true) if it's the input elem that we added
+          // the custom focus callback on.
+          if (focusElem === inputElem) {
+            inputElem.focus(true);
+          } else {
+            focusElem.focus();
+          }
         };
 
         let proto = Object.getPrototypeOf(inputElem);
@@ -3019,9 +3065,6 @@ var __oj_input_date_time_metadata =
           // eslint-disable-next-line no-param-reassign
           value = null;
         }
-        ojconverterutilsI18n.IntlConverterUtils._verifyValueMinMaxNoTime(this.options.value,
-                                                    this.options.min,
-                                                    this.options.max);
 
         retVal = this._super(key, value, flags);
         this._setCurrentDate(value);
@@ -3053,9 +3096,6 @@ var __oj_input_date_time_metadata =
       if (key === 'disabled') {
         this._disableEnable(value);
       } else if (key === 'max' || key === 'min') {
-        ojconverterutilsI18n.IntlConverterUtils._verifyValueMinMaxNoTime(this.options.value,
-                                                    this.options.min,
-                                                    this.options.max);
         // since validators are immutable, they will contain min + max as local values. B/c of this will need to recreate
         this._setValidatorOption('dateTimeRange',
           this._createDateTimeRangeValidator(this._GetConverter()));
@@ -3210,6 +3250,11 @@ var __oj_input_date_time_metadata =
           this._setupResizePopupBind();
         }
       }
+
+      if (this._dpDiv && (this._isInLine || (this.options.readOnly !== true))) {
+        this._registerSwipeHandler();
+      }
+
       return this._super();
     },
 
@@ -3256,6 +3301,8 @@ var __oj_input_date_time_metadata =
       // for non custom element, this is done as first step in destroy
       if (this._IsCustomElement()) {
         this._cleanUpListeners();
+
+        this._unregisterSwipeHandler();
       }
       return this._super();
     },
@@ -4004,39 +4051,22 @@ var __oj_input_date_time_metadata =
      * @private
      */
     _getCurrentDate: function (converter = this._GetConverter()) {
-      let date = new Date();
-
-      const converterOptions =
-        converter && converter.resolvedOptions ? converter.resolvedOptions() : null;
-      if (converterOptions && converterOptions.timeZone) {
+      const date = new Date();
+      const timeZone = _getConverterTimezone(converter);
+      if (timeZone) {
         // toISOString,
         // A string representing the given date in the ISO 8601 format according to universal time
         // so this will always end in a Z.
         const isoZuluOfCurrentDate = date.toISOString();
-        const localToTheTimezonePlaceWithNoTimezone =
-          this._convertIsoStrFormatLocalWithTimezone(isoZuluOfCurrentDate, converterOptions.timeZone);
-        date = ojconverterutilsI18n.IntlConverterUtils.isoToLocalDate(localToTheTimezonePlaceWithNoTimezone);
+        const localToTheTimezonePlaceWithNoTimezone = _convertIsoStrFormatLocalWithTimezone(
+          isoZuluOfCurrentDate,
+          timeZone
+        );
+        return ojconverterutilsI18n.IntlConverterUtils.isoToLocalDate(localToTheTimezonePlaceWithNoTimezone);
       }
       return date;
     },
 
-    /**
-     * This takes an isoDate and returns the iso date that is local to the place of the timezone,
-     * but without the timezone.
-     * This is useful when you want to show a date of the place in the timezone, like right now
-     * in Hong Kong it may be 1/12/2021 2AM.
-     *
-     * @private
-     */
-    _convertIsoStrFormatLocalWithTimezone(isoDate, converterTimeZone) {
-      // Set up a temporary converter to return an ISO string in converterOptions.timeZone timezone
-      if (this._localTZConverter == null) {
-        this._localTZConverter =
-          new ojconverterDatetime.IntlDateTimeConverter({ timeZone: converterTimeZone, isoStrFormat: 'local' });
-      }
-      return this._localTZConverter.parse(isoDate);
-    },
-
     /**
      * Retrieve the component's value in iso format in timezone local time.
      * If value is null, then it uses the current date as the value and
@@ -4045,20 +4075,12 @@ var __oj_input_date_time_metadata =
      * @private
      */
     _calculateValueDateIso: function (converter) {
-      let valueDateIso;
       // dateIso: this.options.value if it exists
-      // or currentDate from the perspective of the timezone but with no timezone info, if any,
+      // or currentDate from the perspective of the local system's timezone but with no timezone info, if any,
       // with no time portion filtered back through IntlConverterUtils.dateToLocalIso()
       const dateIso = this._getDateIso();
-      const converterOptions =
-      converter && converter.resolvedOptions ? converter.resolvedOptions() : null;
-      if (converterOptions && converterOptions.timeZone) {
-        valueDateIso =
-        this._convertIsoStrFormatLocalWithTimezone(dateIso, converterOptions.timeZone);
-      } else {
-        valueDateIso = dateIso;
-      }
-      return valueDateIso;
+      const timeZone = _getConverterTimezone(converter);
+      return timeZone ? _convertIsoStrFormatLocalWithTimezone(dateIso, timeZone) : dateIso;
     },
 
     /**
@@ -4438,6 +4460,12 @@ var __oj_input_date_time_metadata =
       }
     },
 
+    _unregisterSwipeHandler: function () {
+      if (this._dpDiv) {
+        this._dpDiv.off('swiperight swipeleft').ojHammer('destroy');
+      }
+    },
+
     /**
      * If min or max lacks date portion and value contains it, then min + max should use
      * value's date portion
@@ -4607,7 +4635,8 @@ var __oj_input_date_time_metadata =
         if (!(converter instanceof Promise)) {
           // TODO: need to fix this for when converters return Promises.
           // All this does is check that the parsed minDateIso is an isoString.
-          // I'm not sure this is necessary
+          // I'm not sure this is necessary. It is necessary to get it in the
+          // same format as the value.
           minDateIso = converter.parse(minDateIso);
           minDateParams = this._validateDatetime(minDateIso, dateParams, true);
         }
@@ -5664,7 +5693,7 @@ var __oj_input_date_time_metadata =
 
       if (this.options.min != null || this.options.max != null) {
         var rangeValidator = getImplicitDateTimeRangeValidator(this.options, this._GetConverter(),
-          this._GetDefaultStyleClass());
+        this._GetDefaultStyleClass());
         this._datePickerDefaultValidators.dateTimeRange = rangeValidator;
       }
 
@@ -8859,8 +8888,9 @@ var __oj_input_date_time_metadata =
       },
 
       _getPrependNode: function () {
+        const independentPrependNode = this._IsCustomElement() ? $(this.OuterWrapper) : $('body');
         return this._isIndependentInput() ?
-          $('body') :
+          independentPrependNode :
           $('.oj-popup-content', this._datePickerComp.widget._popUpDpDiv.ojPopup('widget'));
       },
 
@@ -9042,11 +9072,18 @@ var __oj_input_date_time_metadata =
         // passing in true to indicate that we want to show the popup of showOn is set
         // to 'focus'.  If this isn't a custom element, we don't want to override the
         // focus functions.
+        // Also, when readonly is true, we just want to focus on the readonly element,
+        // as the popup isn't an issue.
         if (this._IsCustomElement()) {
           let comp = this._getRootElement();
-          let inputElem = this.GetFocusElement();
-          comp.focus = function () {
-            inputElem.focus(true);
+          // We need the input element here regardless of readonly state.
+          let inputElem = this._GetContentElement()[0];
+          comp.focus = () => {
+            if (this.options.readOnly === true) {
+              this.GetFocusElement().focus(); // This should be the readonly focus element.
+            } else {
+              inputElem.focus(true);
+            }
           };
 
           let proto = Object.getPrototypeOf(inputElem);
@@ -9314,6 +9351,8 @@ var __oj_input_date_time_metadata =
           var children = group.children;
           for (var index = 0; index < children.length; index++) {
             wheel = children[index];
+            // This calls Wheel#destroy() and this calls off on each
+            // event listener and destroys Hammer.
             wheel.ojDestroy();
           }
         }
@@ -9349,10 +9388,14 @@ var __oj_input_date_time_metadata =
        * @override
        */
       _ReleaseResources: function () {
-        // for non custom element, this is done as first step in destroy
-        if (this._IsCustomElement()) {
-          this._cleanUpListeners();
-        }
+        // Since destroy calls _ReleaseResources, we do here for both CustomElement and non CustomElement
+        // instead of doing it here for CustomElement and in destroy which is only for non CustomElements.
+        this._removeResizePopupBind();
+        // Note: We do not have a symmetrical 'createHammer' call in SetupResources.
+        // We create the timepicker wheels that have the Hammer events
+        // when the user clicks on the timepicker icon, or when
+        // the component's options change.
+        this._destroyHammer();
         return this._super();
       },
 
@@ -9373,8 +9416,6 @@ var __oj_input_date_time_metadata =
           this._triggerNode.remove();
         }
 
-        this._cleanUpListeners();
-        this._destroyHammer();
         if (this._wheelPicker) {
           this._wheelPicker.remove();
           this._clearWheelModels();
@@ -9388,7 +9429,7 @@ var __oj_input_date_time_metadata =
      * @ignore
      * @private
      */
-      _cleanUpListeners: function () {
+     _removeResizePopupBind: function () {
         if (this._resizePopupBind) {
           window.removeEventListener('resize', this._resizePopupBind);
         }
@@ -11507,6 +11548,9 @@ var __oj_input_date_time_metadata =
 
       /**
        * The maximum selectable datetime, in ISO string format. When set to null, there is no maximum.
+       * <p>So it can be properly compared with the value the user selects, this should be in the same format
+       * as the converter's isoStrFormat since the value the user selects is parsed with the converter. By default, value is a local isostring for oj-date-time-picker.
+       * </p>
        *
        * @example <caption>Initialize the element with the <code class="prettyprint">max</code> attribute:</caption>
        * &lt;oj-date-time-picker max='2014-09-25T13:30:00.000-08:00'&gt;&lt;/oj-date-time-picker&gt;
@@ -11521,7 +11565,9 @@ var __oj_input_date_time_metadata =
        */
       /**
        * The maximum selectable datetime, in ISO string format. When set to null, there is no maximum.
-       *
+       * <p>So it can be properly compared with the value the user selects, this should be in the same format
+       * as the converter's isoStrFormat. By default, value is a local isostring for oj-input-date-time.
+       * </p>
        * @example <caption>Initialize the element with the <code class="prettyprint">max</code> attribute:</caption>
        * &lt;oj-input-date-time max='2014-09-25T13:30:00.000-08:00'&gt;&lt;/oj-input-date-time&gt;
        *
@@ -11536,6 +11582,9 @@ var __oj_input_date_time_metadata =
 
       /**
        * The minimum selectable datetime, in ISO string format. When set to null, there is no minimum.
+       * <p>So it can be properly compared with the value the user selects, this should be in the same format
+       * as the converter's isoStrFormat. By default, value is a local isostring for oj-date-time-picker.
+       * </p>
        *
        * @example <caption>Initialize the element with the <code class="prettyprint">min</code> attribute:</caption>
        * &lt;oj-date-time-picker min='2014-08-25T08:00:00.000-08:00'&gt;&lt;/oj-date-time-picker&gt;
@@ -11550,6 +11599,9 @@ var __oj_input_date_time_metadata =
        */
       /**
        * The minimum selectable datetime, in ISO string format. When set to null, there is no minimum.
+       * <p>So it can be properly compared with the value the user selects, this should be in the same format
+       * as the converter's isoStrFormat since the value the user selects is parsed with the converter. By default, value is a local isostring for oj-input-date-time.
+       * </p>
        *
        * @example <caption>Initialize the element with the <code class="prettyprint">min</code> attribute:</caption>
        * &lt;oj-input-date-time min='2014-08-25T08:00:00.000-08:00'&gt;&lt;/oj-input-date-time&gt;
@@ -12147,6 +12199,53 @@ var __oj_input_date_time_metadata =
 
       return retVal;
     },
+
+    /**
+     * @ignore
+     * @protected
+     * @override
+     * @memberof oj.ojInputDateTime
+     */
+    _ReleaseResources: function () {
+      if (this._IsCustomElement()) {
+        // Trigger the ojInputTime's _ReleaseResources() using the ojInputTime instance.
+        // this._timePicker.ojInputTime('destroy') will not work.
+        // jqueryui-base#destroy will throw an error because IsCustomElement() is true
+        // and you cannot call destroy when IsCustomElement is true.
+        if (this._timePicker) {
+          const timePickerInstance = this._timePicker.ojInputTime('instance');
+          if (timePickerInstance) {
+            timePickerInstance._ReleaseResources();
+            this._timePickerResourcesReleased = true;
+          }
+        }
+      }
+      return this._super();
+    },
+
+    /**
+     * @protected
+     * @override
+     * @instance
+     * @memberof! oj.ojInputDateTime
+     */
+    _SetupResources: function () {
+      var ret = this._superApply(arguments);
+      if (this._IsCustomElement()) {
+        // oj-input-date-time's AfterCreate calls createTimepicker, which creates ojInputTime() which
+        // calls InputTime's _SetupResources.
+        // Then oj-input-date-time's SetupResources is called. Only call ojInputTime's _SetupResources
+        // if they were released in ReleaseResources, so check the flag.
+        if (this._timePickerResourcesReleased && this._timePicker) {
+          const timePickerInstance = this._timePicker.ojInputTime('instance');
+          if (timePickerInstance) {
+            timePickerInstance._SetupResources();
+            this._timePickerResourcesReleased = false;
+          }
+        }
+      }
+      return ret;
+    },
     /**
      * @ignore
      * @protected
@@ -12158,6 +12257,8 @@ var __oj_input_date_time_metadata =
       return this._super();
     },
     /**
+     * Called from _destroy. This is for widgets. Cleaning up custom
+     * elements is done in ReleaseResources
      * @ignore
      * @private
      * @memberof oj.ojInputDateTime
@@ -12178,6 +12279,7 @@ var __oj_input_date_time_metadata =
           this._switcherDiv.remove();
         }
     },
+
     /**
      * @ignore
      * @protected

package/dist/js/libs/oj/debug/ojdialog.js

@@ -3285,22 +3285,13 @@ define(['ojs/ojpopupcore', 'ojs/ojbutton', 'jqueryui-amd/widgets/mouse', 'jquery
       },
 
       _disableBodyOverflow: function () {
-        var body = $(document.body);
-        this._origBodyOverflow = {
-          x: body.css('overflow-x'),
-          y: body.css('overflow-y')
-        };
-        body.css('overflow-x', 'hidden');
-        body.css('overflow-y', 'hidden');
+        var body = document.body;
+        body.classList.add('oj-dialog-sheet-animating');
       },
 
       _restoreBodyOverflow: function () {
-        if (this._origBodyOverflow) {
-          var body = $(document.body);
-          body.css('overflow-x', this._origBodyOverflow.x);
-          body.css('overflow-y', this._origBodyOverflow.y);
-          this._origBodyOverflow = null;
-        }
+        var body = document.body;
+        body.classList.remove('oj-dialog-sheet-animating');
       },
 
       _destroyCloseButton: function () {

package/dist/js/libs/oj/debug/ojdvt-timecomponent.js

@@ -178,38 +178,41 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojtimeaxis-toolkit'], function (exp
      * @param {string} type The raw data object type. Must be either 'series', 'item', 'row', or 'task'
      * @return {object} The sanitized data
      */
-    static sanitizeData(data, type) {
-      var seriesCopy;
-      var itemCopy;
-      var isSeriesData = type === 'series' || type === 'row';
+     static sanitizeData(data, type) {
+      const sanitizeNoTemplateItemData = (item) => {
+        if (item._itemData.taskId) {
+          // Specifically for Gantt with row data supplied and no task template,
+          // _itemData does not have the task's id prop (it has the taskId prop)
+          const itemCopy = Object.assign({}, item._itemData);
+          itemCopy.id = itemCopy.taskId;
+          delete itemCopy.taskId;
+          return itemCopy;
+        }
+        return item._itemData;
+      };
+      const sanitizeItemData = (item) => {
+        const itemCopy = Object.assign({}, item);
+        delete itemCopy._itemData;
+        return itemCopy;
+      };
+      const isSeriesData = type === 'series' || type === 'row';
       if (isSeriesData) {
-        var itemProp = type === 'series' ? 'items' : 'tasks';
-        if (data[itemProp].length > 0) {
-          if (data[itemProp][0]._noTemplate) {
-            seriesCopy = dvt.JsonUtils.clone(data, null, {itemProp: true});
-            seriesCopy[itemProp] = seriesCopy[itemProp].map((item) => {
-              return item._itemData;
-            });
-            return seriesCopy;
-          } else if (data[itemProp][0]._itemData) {
-            seriesCopy = dvt.JsonUtils.clone(data, null, {itemProp: true});
-            seriesCopy[itemProp] = seriesCopy[itemProp].map((item) => {
-              itemCopy = dvt.JsonUtils.clone(item);
-              delete itemCopy._itemData;
-              return itemCopy;
-            });
-            return seriesCopy;
+        const itemProp = type === 'series' ? 'items' : 'tasks';
+        const items = data[itemProp];
+        if (items.length > 0) {
+          const seriesCopy = Object.assign({}, data._noTemplate ? data._itemData : data);
+          if (items[0]._noTemplate) {
+            seriesCopy[itemProp] = data[itemProp].map(sanitizeNoTemplateItemData);
+          } else if (items[0]._itemData) {
+            seriesCopy[itemProp] = data[itemProp].map(sanitizeItemData);
           }
-          return data;
+          return seriesCopy;
         }
-      }
-      else {
+      } else {
         if (data._noTemplate) {
-          return data._itemData;
+          return sanitizeNoTemplateItemData(data);
         } else if (data._itemData) {
-          itemCopy = dvt.JsonUtils.clone(data);
-          delete itemCopy._itemData;
-          return itemCopy;
+          return sanitizeItemData(data);
         }
       }
       return data;
@@ -480,7 +483,7 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojtimeaxis-toolkit'], function (exp
             event.wheelDeltaX = -wheelEvent.deltaX / TimeComponent.SCROLL_LINE_HEIGHT; // number of lines scrolled per mouse wheel click
         }
 
-        if (wheelDelta) { // if vertical mouse wheel amount is defined, non null, non zero 
+        if (wheelDelta) { // if vertical mouse wheel amount is defined, non null, non zero
           var compPagePos = this.getCtx().getStageAbsolutePosition();
           if (this._isVertical)
             var compLoc = event.pageY - compPagePos.y - this.getStartYOffset();

package/dist/js/libs/oj/debug/ojdvt-toolkit.js

@@ -11292,19 +11292,10 @@ define(['exports', 'ojs/ojthemeutils'], function (exports, ThemeUtils) { 'use st
         width = TextUtils._getCanvasTextWidth(context, textString, cssStyle);
       } else {
         // Properties that are supported in <canvas> elements by browser
-        // Chrome supports letterSpacing, wordSpacing, and fontVariantNumeric
-        // Safari supports only supports fontVariantNumeric
+        // Chrome and Safari supports only supports fontVariantNumeric
         // Firefox supports none
-        if (Agent.browser === 'chrome') {
-          if (TextUtils._letterSpacing != letterSpacing || (TextUtils._wordSpacing != wordSpacing) || (TextUtils._fontVariantNumeric != fontVariantNumeric)) {
-            TextUtils._clearCanvasContext();
-            TextUtils._setSpacing(wordSpacing, letterSpacing, fontVariantNumeric);
-          }
-          TextUtils._storeCanvasContext();
-          TextUtils._attachCanvas(context);
-          width = TextUtils._getCanvasTextWidth(context, textString, cssStyle);
-        } else if (Agent.browser === 'safari' && isLetterSpacingNormal && isWordSpacingNormal) {
-          if (TextUtils._fontVariantNumeric != fontVariantNumeric) {
+        if ((Agent.browser === 'safari' || Agent.browser === 'chrome') && isLetterSpacingNormal && isWordSpacingNormal) {
+            if (TextUtils._fontVariantNumeric != fontVariantNumeric) {
             TextUtils._clearCanvasContext();
             TextUtils._setSpacing(wordSpacing, letterSpacing, fontVariantNumeric);
           }