Skip to content

Commit

Permalink
[update] version 7.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexKlimenkov committed Aug 27, 2024
1 parent 3f2a17b commit a2d2525
Show file tree
Hide file tree
Showing 15 changed files with 206 additions and 113 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# dhtmlxScheduler #

[![dhtmlx.com](https://img.shields.io/badge/made%20by-DHTMLX-blue)](https://dhtmlx.com/)
[![npm: v.7.1.0](https://img.shields.io/badge/npm-v.7.1.0-blue.svg)](https://www.npmjs.com/package/dhtmlx-scheduler)
[![npm: v.7.1.1](https://img.shields.io/badge/npm-v.7.1.1-blue.svg)](https://www.npmjs.com/package/dhtmlx-scheduler)
[![License: GPL v2](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)

[DHTMLX Scheduler](https://dhtmlx.com/docs/products/dhtmlxScheduler) is a JavaScript library that allows you to add a Google-like scheduler to your web app or website.
Expand Down Expand Up @@ -87,7 +87,7 @@ scheduler.parse([

## License ##

dhtmlxScheduler v.7.1.0 Standard
dhtmlxScheduler v.7.1.1 Standard

To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product), please obtain Commercial/Enterprise or Ultimate license on our site https://dhtmlx.com/docs/products/dhtmlxScheduler/#licensing or contact us at [email protected]

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": "scheduler",
"version": "7.1.0",
"version": "7.1.1",
"homepage": "https://dhtmlx.com/docs/products/dhtmlxScheduler/",
"description": "JavaScript event calendar. Allows to manage events and appointments in different views",
"main": [
Expand Down
2 changes: 1 addition & 1 deletion codebase/dhtmlxscheduler.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,7 @@ export interface SchedulerStatic {
* creates a mini calendar
* @param config the calendar configuration object
*/
renderCalendar(config: any): void;
renderCalendar(config: any): HTMLElement;

/**
* generates HTML content for a custom event's box
Expand Down
2 changes: 1 addition & 1 deletion codebase/dhtmlxscheduler.es.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,7 @@ export interface SchedulerStatic {
* creates a mini calendar
* @param config the calendar configuration object
*/
renderCalendar(config: any): void;
renderCalendar(config: any): HTMLElement;

/**
* generates HTML content for a custom event's box
Expand Down
113 changes: 62 additions & 51 deletions codebase/dhtmlxscheduler.es.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions codebase/dhtmlxscheduler.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

74 changes: 55 additions & 19 deletions codebase/sources/dhtmlxscheduler.es.js
Original file line number Diff line number Diff line change
Expand Up @@ -8053,27 +8053,56 @@ DataProcessor.prototype = { setTransactionMode: function(mode, total) {
code.call(this, rowId);
}
}
}, _prepareDataItem: function(item) {
var processedItem = {};
var scheduler2 = this.$scheduler;
var copy2 = scheduler2.utils.copy(item);
}, _prepareItemForJson(item) {
const processedItem = {};
const scheduler2 = this.$scheduler;
const copy2 = scheduler2.utils.copy(item);
for (let i in copy2) {
let prop = copy2[i];
if (i.indexOf("_") === 0) {
continue;
} else if (prop) {
if (prop.getUTCFullYear) {
processedItem[i] = scheduler2._helpers.formatDate(prop);
} else if (typeof prop == "object") {
processedItem[i] = this._prepareItemForJson(prop);
} else {
processedItem[i] = prop;
}
} else if (prop !== void 0) {
processedItem[i] = prop;
}
}
processedItem[this.action_param] = scheduler2.getUserData(item.id, this.action_param);
return processedItem;
}, _prepareItemForForm(item) {
const processedItem = {};
const scheduler2 = this.$scheduler;
const copy2 = scheduler2.utils.copy(item);
for (var i in copy2) {
let prop = copy2[i];
if (i.indexOf("_") === 0) {
continue;
} else if (copy2[i]) {
if (copy2[i].getUTCFullYear) {
processedItem[i] = scheduler2._helpers.formatDate(copy2[i]);
} else if (typeof copy2[i] == "object") {
processedItem[i] = this._prepareDataItem(copy2[i]);
} else if (copy2[i] === null) {
processedItem[i] = "";
} else if (prop) {
if (prop.getUTCFullYear) {
processedItem[i] = scheduler2._helpers.formatDate(prop);
} else if (typeof prop == "object") {
processedItem[i] = this._prepareItemForForm(prop);
} else {
processedItem[i] = copy2[i];
processedItem[i] = prop;
}
} else {
processedItem[i] = "";
}
}
processedItem[this.action_param] = scheduler2.getUserData(item.id, this.action_param);
return processedItem;
}, _prepareDataItem: function(item) {
if (this._serializeAsJson) {
return this._prepareItemForJson(item);
} else {
return this._prepareItemForForm(item);
}
}, _getRowData: function(id2) {
var dataItem = this.$scheduler.getEvent(id2);
if (!dataItem) {
Expand Down Expand Up @@ -8723,7 +8752,7 @@ class DatePicker {
}
}
function factoryMethod(extensionManager) {
const scheduler2 = { version: "7.1.0" };
const scheduler2 = { version: "7.1.1" };
scheduler2.$stateProvider = StateService();
scheduler2.getState = scheduler2.$stateProvider.getState;
extend$n(scheduler2);
Expand Down Expand Up @@ -9485,7 +9514,7 @@ function container_autoresize(scheduler2) {
} else {
var evl = data.firstChild;
const rows = evl.querySelectorAll(".dhx_cal_month_row");
if (rows) {
if (rows && rows.length) {
for (var i = 0; i < rows.length; i++) {
h[i]++;
if (h[i] * hb > this._colsS.height - this.xy.month_head_height) {
Expand Down Expand Up @@ -9522,14 +9551,11 @@ function container_autoresize(scheduler2) {
var last = this._els["dhx_multi_day"][0];
last.style.height = dh;
last.style.visibility = h[0] == -1 ? "hidden" : "visible";
last.style.display = h[0] == -1 ? "none" : "";
last = this._els["dhx_multi_day"][1];
last.style.height = dh;
last.style.visibility = h[0] == -1 ? "hidden" : "visible";
if (last.style.visibility == "hidden") {
last.style.display = "none";
} else {
last.style.display = "";
}
last.style.display = h[0] == -1 ? "none" : "";
last.className = h[0] ? "dhx_multi_day_icon" : "dhx_multi_day_icon_small";
this._dy_shift = (h[0] + 1) * hb;
h[0] = 0;
Expand Down Expand Up @@ -19721,6 +19747,13 @@ class TooltipManager {
watchableTarget = targetNode;
config.onmouseenter(event2, targetNode);
};
if (scheduler2._mobile && scheduler2.config.touch_tooltip) {
if (targetNode) {
doOnMouseEnter();
} else {
config.onmouseleave(event2, targetNode);
}
}
if (watchableTarget) {
if (targetNode && targetNode === watchableTarget) {
config.onmousemove(event2, targetNode);
Expand Down Expand Up @@ -19824,6 +19857,9 @@ function tooltip(scheduler2) {
tooltipManager.hideTooltip();
});
scheduler2.attachEvent("onBeforeDrag", function() {
if (scheduler2._mobile && scheduler2.config.touch_tooltip) {
return true;
}
tooltipManager.hideTooltip();
return true;
});
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/dhtmlxscheduler.es.js.map

Large diffs are not rendered by default.

74 changes: 55 additions & 19 deletions codebase/sources/dhtmlxscheduler.js
Original file line number Diff line number Diff line change
Expand Up @@ -8057,27 +8057,56 @@
code.call(this, rowId);
}
}
}, _prepareDataItem: function(item) {
var processedItem = {};
var scheduler2 = this.$scheduler;
var copy = scheduler2.utils.copy(item);
}, _prepareItemForJson(item) {
const processedItem = {};
const scheduler2 = this.$scheduler;
const copy = scheduler2.utils.copy(item);
for (let i in copy) {
let prop = copy[i];
if (i.indexOf("_") === 0) {
continue;
} else if (prop) {
if (prop.getUTCFullYear) {
processedItem[i] = scheduler2._helpers.formatDate(prop);
} else if (typeof prop == "object") {
processedItem[i] = this._prepareItemForJson(prop);
} else {
processedItem[i] = prop;
}
} else if (prop !== void 0) {
processedItem[i] = prop;
}
}
processedItem[this.action_param] = scheduler2.getUserData(item.id, this.action_param);
return processedItem;
}, _prepareItemForForm(item) {
const processedItem = {};
const scheduler2 = this.$scheduler;
const copy = scheduler2.utils.copy(item);
for (var i in copy) {
let prop = copy[i];
if (i.indexOf("_") === 0) {
continue;
} else if (copy[i]) {
if (copy[i].getUTCFullYear) {
processedItem[i] = scheduler2._helpers.formatDate(copy[i]);
} else if (typeof copy[i] == "object") {
processedItem[i] = this._prepareDataItem(copy[i]);
} else if (copy[i] === null) {
processedItem[i] = "";
} else if (prop) {
if (prop.getUTCFullYear) {
processedItem[i] = scheduler2._helpers.formatDate(prop);
} else if (typeof prop == "object") {
processedItem[i] = this._prepareItemForForm(prop);
} else {
processedItem[i] = copy[i];
processedItem[i] = prop;
}
} else {
processedItem[i] = "";
}
}
processedItem[this.action_param] = scheduler2.getUserData(item.id, this.action_param);
return processedItem;
}, _prepareDataItem: function(item) {
if (this._serializeAsJson) {
return this._prepareItemForJson(item);
} else {
return this._prepareItemForForm(item);
}
}, _getRowData: function(id2) {
var dataItem = this.$scheduler.getEvent(id2);
if (!dataItem) {
Expand Down Expand Up @@ -8727,7 +8756,7 @@
}
}
function factoryMethod(extensionManager) {
const scheduler2 = { version: "7.1.0" };
const scheduler2 = { version: "7.1.1" };
scheduler2.$stateProvider = StateService();
scheduler2.getState = scheduler2.$stateProvider.getState;
extend$n(scheduler2);
Expand Down Expand Up @@ -9489,7 +9518,7 @@
} else {
var evl = data.firstChild;
const rows = evl.querySelectorAll(".dhx_cal_month_row");
if (rows) {
if (rows && rows.length) {
for (var i = 0; i < rows.length; i++) {
h[i]++;
if (h[i] * hb > this._colsS.height - this.xy.month_head_height) {
Expand Down Expand Up @@ -9526,14 +9555,11 @@
var last = this._els["dhx_multi_day"][0];
last.style.height = dh;
last.style.visibility = h[0] == -1 ? "hidden" : "visible";
last.style.display = h[0] == -1 ? "none" : "";
last = this._els["dhx_multi_day"][1];
last.style.height = dh;
last.style.visibility = h[0] == -1 ? "hidden" : "visible";
if (last.style.visibility == "hidden") {
last.style.display = "none";
} else {
last.style.display = "";
}
last.style.display = h[0] == -1 ? "none" : "";
last.className = h[0] ? "dhx_multi_day_icon" : "dhx_multi_day_icon_small";
this._dy_shift = (h[0] + 1) * hb;
h[0] = 0;
Expand Down Expand Up @@ -19725,6 +19751,13 @@
watchableTarget = targetNode;
config.onmouseenter(event2, targetNode);
};
if (scheduler2._mobile && scheduler2.config.touch_tooltip) {
if (targetNode) {
doOnMouseEnter();
} else {
config.onmouseleave(event2, targetNode);
}
}
if (watchableTarget) {
if (targetNode && targetNode === watchableTarget) {
config.onmousemove(event2, targetNode);
Expand Down Expand Up @@ -19828,6 +19861,9 @@
tooltipManager.hideTooltip();
});
scheduler2.attachEvent("onBeforeDrag", function() {
if (scheduler2._mobile && scheduler2.config.touch_tooltip) {
return true;
}
tooltipManager.hideTooltip();
return true;
});
Expand Down
2 changes: 1 addition & 1 deletion codebase/sources/dhtmlxscheduler.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion codebase/sources/less/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dhtmlx-scheduler-skins",
"version": "7.1.0",
"version": "7.1.1",
"description": "Less sources and a build tool for DHTMLXScheduler skins",
"scripts": {
"build": "node scripts.js --file=theme",
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-scheduler",
"version": "7.1.0",
"version": "7.1.1",
"description": "JavaScript event calendar. Allows to manage events and appointments in different views",
"main": "codebase/dhtmlxscheduler.es.js",
"types": "codebase/dhtmlxscheduler.es.d.ts",
Expand Down
10 changes: 10 additions & 0 deletions whatsnew.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
### 7.1.1

Fix the issue where the DataProcessor did not allow sending false values
Fix the issue where the Tooltip disappeared on mobile devices after a click
Fix the Tooltip position issue during page scroll
Fix the issue where the container_autoresize plugin hid the multiday section
Fix the issue where the Quick Info popup appeared outside of the container
Fix the issue where unconfirmed events disappeared during scrolling with smart rendering enabled in the Timeline view
Fix the incorrect sections height in the Timeline view after calling scheduler.updateCollection() with active smart rendering

### 7.1.0

Storing recurring events in the RRULE format
Expand Down

0 comments on commit a2d2525

Please sign in to comment.