Skip to content

Commit 40b7d9b

Browse files
committed
[update] version 7.2.5
1 parent 35edb0b commit 40b7d9b

16 files changed

Lines changed: 5900 additions & 5781 deletions

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# dhtmlxScheduler #
22

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

77
[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.
@@ -87,7 +87,7 @@ scheduler.parse([
8787

8888
## License ##
8989

90-
dhtmlxScheduler v.7.2.4 Standard
90+
dhtmlxScheduler v.7.2.5 Standard
9191

9292
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 sales@dhtmlx.com
9393

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "scheduler",
3-
"version": "7.2.4",
3+
"version": "7.2.5",
44
"homepage": "https://dhtmlx.com/docs/products/dhtmlxScheduler/",
55
"description": "JavaScript event calendar. Allows to manage events and appointments in different views",
66
"main": [

codebase/dhtmlxscheduler.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codebase/dhtmlxscheduler.es.js

Lines changed: 5710 additions & 5690 deletions
Large diffs are not rendered by default.

codebase/dhtmlxscheduler.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codebase/dhtmlxscheduler.js

Lines changed: 63 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codebase/dhtmlxscheduler.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codebase/sources/dhtmlxscheduler.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@charset "UTF-8";
12
@font-face {
23
font-family: 'Inter';
34
font-style: normal;

codebase/sources/dhtmlxscheduler.es.js

Lines changed: 53 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @license
22

3-
dhtmlxScheduler v.7.2.4 Standard
3+
dhtmlxScheduler v.7.2.5 Standard
44

55
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 sales@dhtmlx.com
66

@@ -2730,8 +2730,17 @@ function extend$j(scheduler2) {
27302730
start = this._drag_start;
27312731
}
27322732
} else {
2733-
if (end <= start)
2734-
end = start + timeStep * 6e4;
2733+
if (end <= start) {
2734+
if (obj && obj.round_position) {
2735+
if (obj.x_unit == "hour" || obj.x_unit == "minute") {
2736+
end = scheduler2.date.add(start, obj.x_step, obj.x_unit);
2737+
} else {
2738+
end = scheduler2.date.add(scheduler2.date.date_part(new Date(start)), 1, obj.x_unit);
2739+
}
2740+
} else {
2741+
end = start + timeStep * 6e4;
2742+
}
2743+
}
27352744
}
27362745
}
27372746
var new_end = new Date(end - 1);
@@ -3328,8 +3337,8 @@ function extend$j(scheduler2) {
33283337
scheduler2._render_month_scale = function(div, dd, sd, rows) {
33293338
var ed = scheduler2.date.add(dd, 1, "month"), view_start = new Date(sd);
33303339
var cd = scheduler2._currentDate();
3331-
this.date.date_part(cd);
3332-
this.date.date_part(sd);
3340+
cd = this.date.date_part(cd);
3341+
sd = this.date.date_part(sd);
33333342
rows = rows || Math.ceil(Math.round((ed.valueOf() - sd.valueOf()) / (60 * 60 * 24 * 1e3)) / 7);
33343343
var tdwidths = [];
33353344
for (var i = 0; i <= 7; i++) {
@@ -3414,9 +3423,7 @@ function extend$j(scheduler2) {
34143423
};
34153424
scheduler2._reset_month_scale = function(b, dd, sd, rows) {
34163425
var ed = scheduler2.date.add(dd, 1, "month");
3417-
var cd = scheduler2._currentDate();
3418-
this.date.date_part(cd);
3419-
this.date.date_part(sd);
3426+
sd = this.date.date_part(sd);
34203427
rows = rows || Math.ceil(Math.round((ed.valueOf() - sd.valueOf()) / (60 * 60 * 24 * 1e3)) / 7);
34213428
var height = Math.floor(b.clientHeight / rows) - this.xy.month_head_height;
34223429
this._colsS.height = height + this.xy.month_head_height;
@@ -6877,6 +6884,37 @@ function extend$6(scheduler2) {
68776884
break;
68786885
}
68796886
});
6887+
function getDaysInMonth(year, month) {
6888+
return new Date(year, month + 1, 0).getDate();
6889+
}
6890+
scheduler2.event(lightbox, "click", function(e) {
6891+
if (e.target.closest(".dhx_lightbox_day_select") || e.target.closest(".dhx_lightbox_month_select")) {
6892+
const monthSelectNodes = lightbox.querySelectorAll(".dhx_lightbox_month_select");
6893+
const daySelectNodes = lightbox.querySelectorAll(".dhx_lightbox_day_select");
6894+
const yearSelectNodes = lightbox.querySelectorAll(".dhx_lightbox_year_select");
6895+
if (monthSelectNodes.length && daySelectNodes.length && yearSelectNodes) {
6896+
monthSelectNodes.forEach((select, i) => {
6897+
const daySelect = daySelectNodes[i];
6898+
const month = parseInt(select.value, 10);
6899+
let year = parseInt(yearSelectNodes[i].value, 10);
6900+
if (!year) {
6901+
year = new Date(scheduler2.getState().date).getFullYear();
6902+
}
6903+
const daysInMonth = getDaysInMonth(year, month);
6904+
const maxDays = daysInMonth || 31;
6905+
let curDayValue = daySelect.value;
6906+
daySelect.innerHTML = "";
6907+
for (let day = 1; day <= maxDays; day++) {
6908+
const option = document.createElement("option");
6909+
option.value = day;
6910+
option.textContent = day;
6911+
daySelect.appendChild(option);
6912+
}
6913+
daySelect.value = Math.min(curDayValue, maxDays);
6914+
});
6915+
}
6916+
}
6917+
});
68806918
};
68816919
scheduler2.setLightboxSize = function() {
68826920
return;
@@ -9158,7 +9196,7 @@ class DatePicker {
91589196
}
91599197
}
91609198
function factoryMethod(extensionManager) {
9161-
const scheduler2 = { version: "7.2.4" };
9199+
const scheduler2 = { version: "7.2.5" };
91629200
scheduler2.$stateProvider = StateService();
91639201
scheduler2.getState = scheduler2.$stateProvider.getState;
91649202
extend$n(scheduler2);
@@ -20664,6 +20702,12 @@ class Tooltip {
2066420702
tooltip2.top = mouse.y - tooltip2.height - offsetY;
2066520703
tooltip2.bottom = tooltip2.top + tooltip2.height;
2066620704
}
20705+
if (tooltip2.left < 0) {
20706+
tooltip2.left = 0;
20707+
}
20708+
if (tooltip2.right < 0) {
20709+
tooltip2.right = 0;
20710+
}
2066720711
return tooltip2;
2066820712
}
2066920713
_getViewPortSize() {

codebase/sources/dhtmlxscheduler.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)