Skip to content

Commit eca30cd

Browse files
AlexKlimenkovAlexKlimenkov
committed
[update] version 7.2.11
1 parent a89e70d commit eca30cd

13 files changed

+3762
-3683
lines changed

‎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.10](https://img.shields.io/badge/npm-v.7.2.10-blue.svg)](https://www.npmjs.com/package/dhtmlx-scheduler)
4+
[![npm: v.7.2.11](https://img.shields.io/badge/npm-v.7.2.11-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.10 Standard
90+
dhtmlxScheduler v.7.2.11 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.10",
3+
"version": "7.2.11",
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.es.js‎

Lines changed: 3604 additions & 3580 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: 74 additions & 74 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.es.js‎

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

3-
dhtmlxScheduler v.7.2.10 Standard
3+
dhtmlxScheduler v.7.2.11 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

@@ -2165,7 +2165,25 @@ function extend$j(scheduler2) {
21652165
this.$container.insertBefore(materialScalePlaceholder, this._els["dhx_cal_header"][0]);
21662166
}
21672167
materialScalePlaceholder.style.display = "block";
2168-
this.set_xy(materialScalePlaceholder, w, this.xy.scale_height + 1, 0, this._els["dhx_cal_header"][0].offsetTop);
2168+
const navElement = scheduler2.$root.querySelector(".dhx_cal_navline");
2169+
let navHeight = 0;
2170+
if (navElement) {
2171+
navHeight += navElement.offsetHeight;
2172+
}
2173+
const headerElement = scheduler2.$root.querySelector(".dhx_cal_header");
2174+
let headerHeight = 0;
2175+
if (headerElement) {
2176+
headerHeight += headerElement.offsetHeight;
2177+
}
2178+
let offsetTop, offsetHeight;
2179+
if (!headerHeight) {
2180+
offsetTop = navHeight - 4;
2181+
offsetHeight = 5;
2182+
} else {
2183+
offsetTop = navHeight + 1;
2184+
offsetHeight = headerHeight;
2185+
}
2186+
this.set_xy(materialScalePlaceholder, w, offsetHeight, 0, offsetTop);
21692187
} else {
21702188
if (materialScalePlaceholder) {
21712189
materialScalePlaceholder.parentNode.removeChild(materialScalePlaceholder);
@@ -3057,11 +3075,8 @@ function extend$j(scheduler2) {
30573075
var container = this._obj;
30583076
var oldClass = "dhx_scheduler_" + this._mode;
30593077
var newClass = "dhx_scheduler_" + mode;
3060-
if (!this._mode || container.className.indexOf(oldClass) == -1) {
3061-
container.className += " " + newClass;
3062-
} else {
3063-
container.className = container.className.replace(oldClass, newClass);
3064-
}
3078+
container.classList.remove(oldClass);
3079+
container.classList.add(newClass);
30653080
var dhx_multi_day = "dhx_multi_day";
30663081
var prev_scroll = this._mode == mode && this.config.preserve_scroll ? this._els[dhx_cal_data][0].scrollTop : false;
30673082
var multidayScroll;
@@ -4201,6 +4216,7 @@ function extend$g(scheduler2) {
42014216
this.clearAll();
42024217
if (this.$container) {
42034218
this.$container.innerHTML = "";
4219+
this.$container.classList.remove(`dhx_scheduler_${this._mode}`);
42044220
}
42054221
if (this._eventRemoveAll) {
42064222
this._eventRemoveAll();
@@ -9237,7 +9253,7 @@ class DatePicker {
92379253
}
92389254
}
92399255
function factoryMethod(extensionManager) {
9240-
const scheduler2 = { version: "7.2.10" };
9256+
const scheduler2 = { version: "7.2.11" };
92419257
scheduler2.$stateProvider = StateService();
92429258
scheduler2.getState = scheduler2.$stateProvider.getState;
92439259
extend$n(scheduler2);
@@ -9721,7 +9737,10 @@ function agenda_view(scheduler2) {
97219737
scheduler2._colsS = null;
97229738
scheduler2._table_view = true;
97239739
const dateHeader = scheduler2._getNavDateElement();
9724-
dateHeader.innerHTML = scheduler2.templates.agenda_date(scheduler2._date);
9740+
if (dateHeader) {
9741+
dateHeader.innerHTML = scheduler2.templates.agenda_date(scheduler2._date);
9742+
}
9743+
scheduler2.set_sizes();
97259744
fill_agenda_tab();
97269745
} else {
97279746
scheduler2._table_view = false;
@@ -19017,7 +19036,7 @@ function recurring(scheduler2) {
1901719036
copy2.start_date = date;
1901819037
copy2.id = ev.id + "#" + Math.ceil(date.valueOf());
1901919038
copy2.end_date = new Date(date.valueOf() + eventDuration * 1e3);
19020-
if (copy2.end_date.valueOf() < scheduler2._min_date.valueOf()) {
19039+
if (copy2.end_date.valueOf() <= scheduler2._min_date.valueOf()) {
1902119040
continue;
1902219041
}
1902319042
copy2.end_date = scheduler2._fix_daylight_saving_date(copy2.start_date, copy2.end_date, ev, date, copy2.end_date);
@@ -21281,6 +21300,9 @@ function year_view(scheduler2) {
2128121300
var locateEvent = scheduler2._locate_event;
2128221301
scheduler2._locate_event = function(node) {
2128321302
var id = locateEvent.apply(scheduler2, arguments);
21303+
if (!isYearMode()) {
21304+
return id;
21305+
}
2128421306
if (!id) {
2128521307
var date = getCellDate(node);
2128621308
if (!date)

‎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.

‎codebase/sources/dhtmlxscheduler.js‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
})(this, function(exports2) {
44
"use strict";/** @license
55

6-
dhtmlxScheduler v.7.2.10 Standard
6+
dhtmlxScheduler v.7.2.11 Standard
77

88
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
99

@@ -2169,7 +2169,25 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
21692169
this.$container.insertBefore(materialScalePlaceholder, this._els["dhx_cal_header"][0]);
21702170
}
21712171
materialScalePlaceholder.style.display = "block";
2172-
this.set_xy(materialScalePlaceholder, w, this.xy.scale_height + 1, 0, this._els["dhx_cal_header"][0].offsetTop);
2172+
const navElement = scheduler2.$root.querySelector(".dhx_cal_navline");
2173+
let navHeight = 0;
2174+
if (navElement) {
2175+
navHeight += navElement.offsetHeight;
2176+
}
2177+
const headerElement = scheduler2.$root.querySelector(".dhx_cal_header");
2178+
let headerHeight = 0;
2179+
if (headerElement) {
2180+
headerHeight += headerElement.offsetHeight;
2181+
}
2182+
let offsetTop, offsetHeight;
2183+
if (!headerHeight) {
2184+
offsetTop = navHeight - 4;
2185+
offsetHeight = 5;
2186+
} else {
2187+
offsetTop = navHeight + 1;
2188+
offsetHeight = headerHeight;
2189+
}
2190+
this.set_xy(materialScalePlaceholder, w, offsetHeight, 0, offsetTop);
21732191
} else {
21742192
if (materialScalePlaceholder) {
21752193
materialScalePlaceholder.parentNode.removeChild(materialScalePlaceholder);
@@ -3061,11 +3079,8 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
30613079
var container = this._obj;
30623080
var oldClass = "dhx_scheduler_" + this._mode;
30633081
var newClass = "dhx_scheduler_" + mode;
3064-
if (!this._mode || container.className.indexOf(oldClass) == -1) {
3065-
container.className += " " + newClass;
3066-
} else {
3067-
container.className = container.className.replace(oldClass, newClass);
3068-
}
3082+
container.classList.remove(oldClass);
3083+
container.classList.add(newClass);
30693084
var dhx_multi_day = "dhx_multi_day";
30703085
var prev_scroll = this._mode == mode && this.config.preserve_scroll ? this._els[dhx_cal_data][0].scrollTop : false;
30713086
var multidayScroll;
@@ -4205,6 +4220,7 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
42054220
this.clearAll();
42064221
if (this.$container) {
42074222
this.$container.innerHTML = "";
4223+
this.$container.classList.remove(`dhx_scheduler_${this._mode}`);
42084224
}
42094225
if (this._eventRemoveAll) {
42104226
this._eventRemoveAll();
@@ -9241,7 +9257,7 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
92419257
}
92429258
}
92439259
function factoryMethod(extensionManager) {
9244-
const scheduler2 = { version: "7.2.10" };
9260+
const scheduler2 = { version: "7.2.11" };
92459261
scheduler2.$stateProvider = StateService();
92469262
scheduler2.getState = scheduler2.$stateProvider.getState;
92479263
extend$n(scheduler2);
@@ -9725,7 +9741,10 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
97259741
scheduler2._colsS = null;
97269742
scheduler2._table_view = true;
97279743
const dateHeader = scheduler2._getNavDateElement();
9728-
dateHeader.innerHTML = scheduler2.templates.agenda_date(scheduler2._date);
9744+
if (dateHeader) {
9745+
dateHeader.innerHTML = scheduler2.templates.agenda_date(scheduler2._date);
9746+
}
9747+
scheduler2.set_sizes();
97299748
fill_agenda_tab();
97309749
} else {
97319750
scheduler2._table_view = false;
@@ -19021,7 +19040,7 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
1902119040
copy.start_date = date;
1902219041
copy.id = ev.id + "#" + Math.ceil(date.valueOf());
1902319042
copy.end_date = new Date(date.valueOf() + eventDuration * 1e3);
19024-
if (copy.end_date.valueOf() < scheduler2._min_date.valueOf()) {
19043+
if (copy.end_date.valueOf() <= scheduler2._min_date.valueOf()) {
1902519044
continue;
1902619045
}
1902719046
copy.end_date = scheduler2._fix_daylight_saving_date(copy.start_date, copy.end_date, ev, date, copy.end_date);
@@ -21285,6 +21304,9 @@ To use dhtmlxScheduler in non-GPL projects (and get Pro version of the product),
2128521304
var locateEvent = scheduler2._locate_event;
2128621305
scheduler2._locate_event = function(node) {
2128721306
var id = locateEvent.apply(scheduler2, arguments);
21307+
if (!isYearMode()) {
21308+
return id;
21309+
}
2128821310
if (!id) {
2128921311
var date = getCellDate(node);
2129021312
if (!date)

‎codebase/sources/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.

0 commit comments

Comments
 (0)