Skip to content

Commit

Permalink
[update] version 7.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexKlimenkov committed May 14, 2020
1 parent bcb2c46 commit 65e1162
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 70 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# dhtmlxGantt #

[![dhtmlx.com](https://img.shields.io/badge/made%20by-DHTMLX-blue)](https://dhtmlx.com/)
[![npm: v.7.0.2](https://img.shields.io/badge/npm-v.7.0.2-blue.svg)](https://www.npmjs.com/package/dhtmlx-gantt)
[![npm: v.7.0.3](https://img.shields.io/badge/npm-v.7.0.3-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) | [Follow us](#followus) | [License](#license) | [Useful links](#links)
Expand Down Expand Up @@ -128,7 +128,7 @@ Like our page on [Facebook](https://www.facebook.com/dhtmlx/) :thumbsup:
<a name="license"></a>
## License ##

dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard

This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gantt",
"version": "7.0.2",
"version": "7.0.3",
"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": [
Expand Down
2 changes: 1 addition & 1 deletion codebase/dhtmlxgantt.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Type definitions for dhtmlxGantt 7.0.2
// Type definitions for dhtmlxGantt 7.0.3
// Project: https://dhtmlx.com/docs/products/dhtmlxGantt

type GanttCallback = (...args: any[]) => any;
Expand Down
4 changes: 2 additions & 2 deletions codebase/dhtmlxgantt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion codebase/dhtmlxgantt.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion codebase/sources/dhtmlxgantt.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
67 changes: 13 additions & 54 deletions codebase/sources/dhtmlxgantt.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license

dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard

This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.

Expand Down Expand Up @@ -15007,7 +15007,7 @@ module.exports = function(gantt){

if(mapping){
return mapping;
}else if(gantt.config.keyboard_navigation_cells){
}else if(gantt.config.keyboard_navigation_cells && gantt.ext.keyboardNavigation){
return keyNavMappings;
}else{
return defaultMapping;
Expand Down Expand Up @@ -29733,7 +29733,7 @@ CalendarWorkTimeStrategy.prototype = {
equals: function (calendar) {
if(!(calendar instanceof CalendarWorkTimeStrategy)){
return false;
}
}

var mySettings = this.getConfig();
var thatSettings = calendar.getConfig();
Expand All @@ -29757,7 +29757,7 @@ CalendarWorkTimeStrategy.prototype = {
var otherHours = mySettings.dates[timestamp];

// day settings not equal
if(myHours !== otherHours &&
if(myHours !== otherHours &&
// but still can be two arrays with the equivalent hour settings
!(Array.isArray(myHours) && Array.isArray(otherHours) && this._arraysEqual(myHours, otherHours))
){
Expand Down Expand Up @@ -29821,7 +29821,7 @@ CalendarWorkTimeStrategy.prototype = {
if(parsed[2]){
value += parseInt(parsed[2]);
}

timestampRanges.push(value);
});

Expand Down Expand Up @@ -30171,7 +30171,7 @@ CalendarWorkTimeStrategy.prototype = {

/**
* Check whether this calendar has working time. Calendar has working time only if there are regular working days of week
*
*
*/
hasWorkTime: function () {
var worktime = this.getConfig();
Expand All @@ -30188,7 +30188,7 @@ CalendarWorkTimeStrategy.prototype = {
var hasRegularHours = this._checkWorkHours(worktime.hours);

var result = false;
daysOfWeek.forEach(function(day){
daysOfWeek.forEach((function(day){
if(result){
return;
}
Expand All @@ -30201,7 +30201,7 @@ CalendarWorkTimeStrategy.prototype = {
// workday uses custom hours
result = this._checkWorkHours(dayConfig);
}
});
}).bind(this));

return result;

Expand Down Expand Up @@ -32016,13 +32016,13 @@ module.exports = function(gantt){
});

gantt.attachEvent("onGanttRender", function(){
gantt.eventRemove(document, "keydown", keyDownHandler);
gantt.eventRemove(gantt.$root, "keydown", keyDownHandler);
gantt.eventRemove(gantt.$container, "focus", focusHandler);
gantt.eventRemove(gantt.$container, "mousedown", mousedownHandler);

if(gantt.config.keyboard_navigation){

gantt.event(document, "keydown", keyDownHandler);
gantt.event(gantt.$root, "keydown", keyDownHandler);
gantt.event(gantt.$container, "focus", focusHandler);
gantt.event(gantt.$container, "mousedown", mousedownHandler);
gantt.$container.setAttribute("tabindex", "0");
Expand Down Expand Up @@ -32137,44 +32137,12 @@ module.exports = function(gantt){
return true;
});

function getActiveNode(){

var activeElement = document.activeElement;
if(activeElement === document.body && document.getSelection){
activeElement = document.getSelection().focusNode || document.body;
}

return activeElement;
}

var interval = setInterval(function(){
if(!gantt.config.keyboard_navigation) return;

var enable;
var focusElement = getActiveNode();

var parent = gantt.$container;
// halt key nav when focus is outside gantt or in quick info popup
if(!focusElement || gantt._locate_css(focusElement, "gantt_cal_quick_info")){
enable = false;
}else{
while(focusElement != parent && focusElement){
focusElement = focusElement.parentNode;
}

if(focusElement == parent){
enable = true;
}else{
enable = false;
}
}

if(enable && !dispatcher.isEnabled()){
if(!dispatcher.isEnabled()){
dispatcher.enable();
}else if(!enable && dispatcher.isEnabled()){
dispatcher.disable();
}

return;
}, 500);

gantt.attachEvent("onDestroy", function(){
Expand Down Expand Up @@ -32604,13 +32572,11 @@ module.exports = function(gantt) {

enable: function () {
this.isActive = true;
this.globalNode.enable();
this.setActiveNode(this.getActiveNode());
},

disable: function () {
this.isActive = false;
this.globalNode.disable();
},

isEnabled: function () {
Expand Down Expand Up @@ -32768,13 +32734,6 @@ module.exports = function(gantt) {

},

disable: function () {
gantt.$container.setAttribute("tabindex", "0");
},
enable: function () {
if (gantt.$container)
gantt.$container.removeAttribute("tabindex");
},
isEnabled: function () {
return gantt.$container.hasAttribute("tabindex");
},
Expand Down Expand Up @@ -35511,7 +35470,7 @@ exports.Undo = Undo;

function DHXGantt(){
this.constants = __webpack_require__(/*! ../constants */ "./sources/constants/index.js");
this.version = "7.0.2";
this.version = "7.0.3";
this.license = "gpl";
this.templates = {};
this.ext = {};
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_broadway.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_contrast_black.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_contrast_white.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_material.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_meadow.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_skyblue.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/skins/dhtmlxgantt_terrace.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
@license
dhtmlxGantt v.7.0.2 Standard
dhtmlxGantt v.7.0.3 Standard
This version of dhtmlxGantt is distributed under GPL 2.0 license and can be legally used in GPL projects.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dhtmlx-gantt",
"version": "7.0.2",
"version": "7.0.3",
"description": "An open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart.",
"main": "codebase/dhtmlxgantt.js",
"types": "codebase/dhtmlxgantt.d.ts",
Expand Down
5 changes: 5 additions & 0 deletions whatsnew.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 7.0.3

- Fix regression in the setWorkTime method which caused a script error when the working time is set for a specific day
- Fix the incorrect work of the Keyboard Navigation extension when Gantt is used inside a SalesForce Lightning Web Component

### 7.0.2

- Fix the incorrect work of date formatters when gantt.config.csp is set to true.
Expand Down

0 comments on commit 65e1162

Please sign in to comment.