[update] version 9.0.11

Author: AlexKlimenkov

README.md

@@ -1,7 +1,7 @@
 # dhtmlxGantt #
 
 [![dhtmlx.com](https://img.shields.io/badge/made%20by-DHTMLX-blue)](https://dhtmlx.com/)
-[![npm: v.9.0.10](https://img.shields.io/badge/npm-v.9.0.10-blue.svg)](https://www.npmjs.com/package/dhtmlx-gantt)
+[![npm: v.9.0.11](https://img.shields.io/badge/npm-v.9.0.11-blue.svg)](https://www.npmjs.com/package/dhtmlx-gantt)
 [![License: GPL v2](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
 [Getting started](#getting-started) | [Features](#features) | [License](#license) | [Useful links](#links) | [Follow us](#followus)
@@ -117,7 +117,7 @@ Resource management, critical path calculation, auto scheduling, and other enhan
 <a name="license"></a>
 ## License ##
 
-dhtmlxGantt v.9.0.10 Standard
+dhtmlxGantt v.9.0.11 Standard
 
 This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gantt",
-  "version": "9.0.10",
+  "version": "9.0.11",
   "homepage": "https://dhtmlx.com/docs/products/dhtmlxGantt/",
   "description": "An open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart.",
   "main": [

codebase/dhtmlxgantt.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for dhtmlxGantt 9.0.10
+// Type definitions for dhtmlxGantt 9.0.11
 // Project: https://dhtmlx.com/docs/products/dhtmlxGantt
 
 type GanttCallback = (...args: any[]) => any;

codebase/dhtmlxgantt.es.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for dhtmlxGantt 9.0.10
+// Type definitions for dhtmlxGantt 9.0.11
 // Project: https://dhtmlx.com/docs/products/dhtmlxGantt
 
 type GanttCallback = (...args: any[]) => any;

codebase/dhtmlxgantt.es.js

@@ -1,6 +1,6 @@
 /** @license
 
-dhtmlxGantt v.9.0.10 Standard
+dhtmlxGantt v.9.0.11 Standard
 
 This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
 
@@ -952,9 +952,9 @@ class EventsManager2 {
       const gantt3 = this._gantt;
       this._trace = [];
       gantt3.$root.classList.remove("gantt_noselect");
-      if (this._originalReadonly !== void 0) {
+      if (this._originalReadonly !== void 0 && this._mouseDown) {
         gantt3.config.readonly = this._originalReadonly;
-        if (this._mouseDown && gantt3.config.drag_timeline && gantt3.config.drag_timeline.render) {
+        if (gantt3.config.drag_timeline && gantt3.config.drag_timeline.render) {
           gantt3.render();
         }
       }
@@ -5068,7 +5068,7 @@ const config = () => {
   return result;
 };
 var isWindowAwailable = typeof window !== "undefined";
-const env = { isIE: isWindowAwailable && (navigator.userAgent.indexOf("MSIE") >= 0 || navigator.userAgent.indexOf("Trident") >= 0), isIE6: isWindowAwailable && (!XMLHttpRequest && navigator.userAgent.indexOf("MSIE") >= 0), isIE7: isWindowAwailable && (navigator.userAgent.indexOf("MSIE 7.0") >= 0 && navigator.userAgent.indexOf("Trident") < 0), isIE8: isWindowAwailable && (navigator.userAgent.indexOf("MSIE 8.0") >= 0 && navigator.userAgent.indexOf("Trident") >= 0), isOpera: isWindowAwailable && navigator.userAgent.indexOf("Opera") >= 0, isChrome: isWindowAwailable && navigator.userAgent.indexOf("Chrome") >= 0, isKHTML: isWindowAwailable && (navigator.userAgent.indexOf("Safari") >= 0 || navigator.userAgent.indexOf("Konqueror") >= 0), isFF: isWindowAwailable && navigator.userAgent.indexOf("Firefox") >= 0, isIPad: isWindowAwailable && navigator.userAgent.search(/iPad/gi) >= 0, isEdge: isWindowAwailable && navigator.userAgent.indexOf("Edge") != -1, isNode: !isWindowAwailable || typeof navigator == "undefined" || false === "test" };
+const env = { isIE: isWindowAwailable && (navigator.userAgent.indexOf("MSIE") >= 0 || navigator.userAgent.indexOf("Trident") >= 0), isOpera: isWindowAwailable && (navigator.userAgent.indexOf("Opera") >= 0 || navigator.userAgent.indexOf("OPR") >= 0), isChrome: isWindowAwailable && navigator.userAgent.indexOf("Chrome") >= 0, isSafari: isWindowAwailable && (navigator.userAgent.indexOf("Safari") >= 0 || navigator.userAgent.indexOf("Konqueror") >= 0), isFF: isWindowAwailable && navigator.userAgent.indexOf("Firefox") >= 0, isIPad: isWindowAwailable && navigator.userAgent.search(/iPad/gi) >= 0, isEdge: isWindowAwailable && navigator.userAgent.indexOf("Edge") != -1, isNode: !isWindowAwailable || typeof navigator == "undefined" || false === "test", isSalesforce: isWindowAwailable && (!!scope["Sfdc"] || !!scope["$A"] || scope["Aura"]) };
 function serialize(data2) {
   if (typeof data2 === "string" || typeof data2 === "number") {
     return data2;
@@ -11852,8 +11852,12 @@ WorkTimeCalendarMerger.prototype = { _getIntervals: function(hoursArray) {
 }, _mergeHoursConfig: function(firstHours, secondHours) {
   return this._mergeAdjacentIntervals(this._intersectHourRanges(firstHours, secondHours));
 }, merge: function(first, second) {
-  var firstConfig = copy(first.getConfig().parsed);
-  var secondConfig = copy(second.getConfig().parsed);
+  const firstCalendar = copy(first.getConfig());
+  const secondCalendar = copy(second.getConfig());
+  const firstConfig = firstCalendar.parsed;
+  const secondConfig = secondCalendar.parsed;
+  firstConfig.customWeeks = firstCalendar.customWeeks;
+  secondConfig.customWeeks = secondCalendar.customWeeks;
   var mergedSettings = { hours: this._toHoursArray(this._mergeHoursConfig(firstConfig.hours, secondConfig.hours)), dates: {}, customWeeks: {} };
   const processCalendar = (config1, config2) => {
     for (let i2 in config1.dates) {
@@ -11882,7 +11886,11 @@ WorkTimeCalendarMerger.prototype = { _getIntervals: function(hoursArray) {
   }
   if (secondConfig.customWeeks) {
     for (var i in secondConfig.customWeeks) {
-      mergedSettings.customWeeks[i] = secondConfig.customWeeks[i];
+      if (mergedSettings.customWeeks[i]) {
+        mergedSettings.customWeeks[i + "_second"] = secondConfig.customWeeks[i];
+      } else {
+        mergedSettings.customWeeks[i] = secondConfig.customWeeks[i];
+      }
     }
   }
   return mergedSettings;
@@ -13272,7 +13280,7 @@ CalendarManager.prototype = { _calendars: {}, _convertWorkTimeSettings: function
     } else {
       resourceProperty = legacyResourceCalendarConfig.getResourceProperty(config2);
     }
-    if (Array.isArray(task[resourceProperty])) {
+    if (Array.isArray(task[resourceProperty]) && task[resourceProperty].length) {
       if (config2.dynamic_resource_calendars) {
         calendarId = dynamicResourceCalendars.getCalendarIdFromMultipleResources(task[resourceProperty], this);
       } else {
@@ -14086,8 +14094,7 @@ function addResizeListener(gantt2) {
     resizeWatcher.setAttribute("role", "none");
     resizeWatcher.setAttribute("aria-hidden", true);
   }
-  var salesforce_environment = !!window["Sfdc"] || !!window["$A"] || window["Aura"];
-  if (salesforce_environment) {
+  if (gantt2.env.isSalesforce) {
     gantt2.config.container_resize_method = "timeout";
   }
   gantt2.$root.appendChild(resizeWatcher);
@@ -14543,7 +14550,7 @@ function i18nFactory() {
 }
 function DHXGantt() {
   this.constants = constants;
-  this.version = "9.0.10";
+  this.version = "9.0.11";
   this.license = "gpl";
   this.templates = {};
   this.ext = {};
@@ -14698,6 +14705,8 @@ function messages(gantt2) {
       messageBox.area = document.createElement("div");
       messageBox.area.className = "gantt_message_area";
       messageBox.area.style[messageBox.position] = "5px";
+    }
+    if (!isChildOf(messageBox.area, document.body)) {
       document.body.appendChild(messageBox.area);
     }
     messageBox.hide(text.id);
@@ -15477,17 +15486,17 @@ var layerFactory = function(gantt2) {
         layer.id = layer.id || uid();
         this.tempCollection.push(layer);
       }
-      var container = this.container();
-      var pending = this.tempCollection;
-      for (var i = 0; i < pending.length; i++) {
+      const container = this.container();
+      const pending = this.tempCollection;
+      for (let i = 0; i < pending.length; i++) {
         layer = pending[i];
-        if (!this.container() && !(layer && layer.container && isChildOf(layer.container, document.body))) continue;
-        var node = layer.container, id = layer.id, topmost = layer.topmost;
+        if (!this.container() && !(layer && layer.container && layer.container.isConnected)) continue;
+        let node = layer.container, id = layer.id, topmost = layer.topmost;
         if (!node.parentNode) {
           if (topmost) {
             container.appendChild(node);
           } else {
-            var rel = relativeRoot ? relativeRoot() : container.firstChild;
+            let rel = relativeRoot ? relativeRoot() : container.firstChild;
             if (rel && rel.parentNode == container) container.insertBefore(node, rel);
             else container.appendChild(node);
           }
@@ -20970,7 +20979,7 @@ function createGridLineRender(gantt2) {
     for (var i = 0; i < columns.length; i++) {
       var column = columns[i];
       if (column.onrender) {
-        var cellNode = rowNode.querySelector("[data-column-name=" + column.name + "]");
+        var cellNode = rowNode.querySelector(`[data-column-name="${column.name}"]`);
         if (cellNode) {
           var content = column.onrender(item, cellNode);
           if (content && typeof content === "string") {
@@ -24940,8 +24949,7 @@ function lightbox(gantt2) {
   gantt2._lightbox_root = gantt2.$root;
   function setParentNode() {
     const cspEnvironment = gantt2.config.csp === true;
-    const salesforceEnvironment = !!window["Sfdc"] || !!window["$A"] || window["Aura"] || "$shadowResolver$" in document.body;
-    if (cspEnvironment || salesforceEnvironment) {
+    if (cspEnvironment || gantt2.env.isSalesforce) {
       gantt2._lightbox_root = gantt2.$root;
     } else {
       gantt2._lightbox_root = document.body;
@@ -25262,22 +25270,27 @@ function lightbox(gantt2) {
     return mapping;
   };
   gantt2.getLightboxValues = function() {
-    var task = {};
+    let task = {};
     if (gantt2.isTaskExists(this._lightbox_id)) {
       task = this.mixin({}, this.getTask(this._lightbox_id));
     }
-    var sns = this._get_typed_lightbox_config();
-    for (var i = 0; i < sns.length; i++) {
-      var node = gantt2._lightbox_root.querySelector("#" + sns[i].id);
+    const sns = this._get_typed_lightbox_config();
+    const sortedSns = [...sns].sort((a, b) => {
+      if (a.name === "time") return 1;
+      if (b.name === "time") return -1;
+      return 0;
+    });
+    for (let i = 0; i < sortedSns.length; i++) {
+      let node = gantt2._lightbox_root.querySelector("#" + sortedSns[i].id);
       node = node ? node.nextSibling : node;
-      var block = this.form_blocks[sns[i].type];
+      let block = this.form_blocks[sortedSns[i].type];
       if (!block) continue;
-      var res = block.get_value.call(this, node, task, sns[i]);
-      var map_to = gantt2._resolve_default_mapping(sns[i]);
+      let res = block.get_value.call(this, node, task, sortedSns[i]);
+      let map_to = gantt2._resolve_default_mapping(sortedSns[i]);
       if (typeof map_to == "string" && map_to != "auto") {
         task[map_to] = res;
       } else if (typeof map_to == "object") {
-        for (var property in map_to) {
+        for (let property in map_to) {
           if (map_to[property]) task[map_to[property]] = res[property];
         }
       }