@syncfusion/ej2-schedule 22.2.11 → 22.2.12

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 22.2.11
+*  version : 22.2.12
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-schedule@*",
-  "_id": "@syncfusion/ej2-schedule@22.2.8",
+  "_id": "@syncfusion/ej2-schedule@22.2.11",
   "_inBundle": false,
-  "_integrity": "sha512-Kx0CfzH9nk0XZaYgJGZpQXWGCWARyl7WB9pF2s8F7U749gjOQ/9T/+jYXY/9ViAcoH0YKgy1LsvCy1fl2Pa6cQ==",
+  "_integrity": "sha512-f2u5jsuLDc7QiGNWzKJgamDYPya3eP8kUqK3cMWRxg6Kae0ye9vz0UeB5H9dzuGJ9HnuiFMjYAQnPlqBgIjcMQ==",
   "_location": "/@syncfusion/ej2-schedule",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-schedule",
     "/@syncfusion/ej2-vue-schedule"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-22.2.8.tgz",
-  "_shasum": "d4abd42dfb2c617501dbb6a65a870fd9e915774e",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-22.2.11.tgz",
+  "_shasum": "c9ed2e7b2272b7c886b7dfd771a7bb7fd0e910e1",
   "_spec": "@syncfusion/ej2-schedule@*",
   "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
   "author": {
@@ -35,13 +35,13 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~22.2.10",
+    "@syncfusion/ej2-base": "~22.2.12",
     "@syncfusion/ej2-buttons": "~22.2.9",
-    "@syncfusion/ej2-calendars": "~22.2.11",
+    "@syncfusion/ej2-calendars": "~22.2.12",
     "@syncfusion/ej2-data": "~22.2.5",
-    "@syncfusion/ej2-dropdowns": "~22.2.11",
+    "@syncfusion/ej2-dropdowns": "~22.2.12",
     "@syncfusion/ej2-excel-export": "~22.2.5",
-    "@syncfusion/ej2-inputs": "~22.2.9",
+    "@syncfusion/ej2-inputs": "~22.2.12",
     "@syncfusion/ej2-lists": "~22.2.11",
     "@syncfusion/ej2-navigations": "~22.2.11",
     "@syncfusion/ej2-popups": "~22.2.11"
@@ -73,6 +73,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "22.2.11",
+  "version": "22.2.12",
   "sideEffects": false
 }

package/src/recurrence-editor/date-generator.d.ts

@@ -23,11 +23,10 @@ export declare function generateSummary(rule: string, localeObject: L10n, locale
  * @param {number} maximumCount Accepts the maximum number count to generate date collections
  * @param {Date} viewDate Accepts the current date instead of start date
  * @param {CalendarType} calendarMode Accepts the calendar type
- * @param {string} oldTimezone Accepts the timezone name
  * @param {string} newTimezone Accepts the timezone name
  * @returns {number[]} Returns the collection of dates
  */
-export declare function generate(startDate: Date, rule: string, excludeDate: string, startDayOfWeek: number, maximumCount?: number, viewDate?: Date, calendarMode?: CalendarType, oldTimezone?: string, newTimezone?: string): number[];
+export declare function generate(startDate: Date, rule: string, excludeDate: string, startDayOfWeek: number, maximumCount?: number, viewDate?: Date, calendarMode?: CalendarType, newTimezone?: string): number[];
 /**
  * Generate date object from given date string
  *

package/src/recurrence-editor/date-generator.js

@@ -103,15 +103,13 @@ function getMonthSummary(ruleObject, cldrObj, localeObj) {
  * @param {number} maximumCount Accepts the maximum number count to generate date collections
  * @param {Date} viewDate Accepts the current date instead of start date
  * @param {CalendarType} calendarMode Accepts the calendar type
- * @param {string} oldTimezone Accepts the timezone name
  * @param {string} newTimezone Accepts the timezone name
  * @returns {number[]} Returns the collection of dates
  */
-export function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCount, viewDate, calendarMode, oldTimezone, newTimezone) {
+export function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCount, viewDate, calendarMode, newTimezone) {
     if (maximumCount === void 0) { maximumCount = MAXOCCURRENCE; }
     if (viewDate === void 0) { viewDate = null; }
     if (calendarMode === void 0) { calendarMode = 'Gregorian'; }
-    if (oldTimezone === void 0) { oldTimezone = null; }
     if (newTimezone === void 0) { newTimezone = null; }
     var ruleObject = extractObjectFromRule(rule);
     var cacheDate;
@@ -123,8 +121,8 @@ export function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCo
     var tz = new Timezone();
     tempDate.forEach(function (content) {
         var parsedDate = getDateFromRecurrenceDateString(content);
-        if (oldTimezone && newTimezone) {
-            parsedDate = tz.convert(new Date(parsedDate.getTime()), oldTimezone, newTimezone);
+        if (newTimezone) {
+            parsedDate = tz.add(new Date(parsedDate.getTime()), newTimezone);
         }
         tempExcludeDate.push(new Date(parsedDate.getTime()).setHours(0, 0, 0, 0));
     });

package/src/recurrence-editor/recurrence-editor.d.ts

@@ -229,5 +229,5 @@ export declare type RepeatType = 'none' | 'daily' | 'weekly' | 'monthly' | 'year
 * until :- Denotes that the recurrence ends on a specified date.
 * count :- Denotes that the recurrence ends after a specified number of occurrences.
 * ```
-*/
+ */
 export declare type EndType = 'never' | 'until' | 'count';

package/src/schedule/actions/crud.js

@@ -338,7 +338,8 @@ var Crud = /** @class */ (function () {
         }
         var updateEvents = (eventData instanceof Array) ? eventData : [eventData];
         var args = {
-            requestType: action === 'EditOccurrence' ? 'eventChange' : 'eventRemove', cancel: false,
+            requestType: action === 'EditOccurrence' ? 'eventChange' : 'eventRemove',
+            cancel: false,
             addedRecords: [], changedRecords: updateEvents, deletedRecords: []
         };
         args.data = occurrenceData;
@@ -649,6 +650,10 @@ var Crud = /** @class */ (function () {
         return parentEvent;
     };
     Crud.prototype.excludeDateCheck = function (eventStartTime, exceptionDateList) {
+        var timezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
+        if (timezone) {
+            eventStartTime = this.parent.tzModule.remove(new Date(+eventStartTime.getTime()), timezone);
+        }
         var exDate = getRecurrenceStringFromDate(eventStartTime);
         if (!isNullOrUndefined(exceptionDateList)) {
             if (exceptionDateList.indexOf(exDate) === -1) {

package/src/schedule/actions/keyboard.js

@@ -211,6 +211,11 @@ var KeyboardInteraction = /** @class */ (function () {
         }
         var queryStr = '.' + cls.WORK_CELLS_CLASS + ',.' + cls.ALLDAY_CELLS_CLASS + ',.' + cls.HEADER_CELLS_CLASS;
         var target = closest(e.target, queryStr);
+        var selectedCells = this.parent.getSelectedCells();
+        if (this.parent.activeViewOptions.group.resources.length > 0 && selectedCells.length > 0 &&
+            selectedCells[0].getAttribute('data-group-index') !== target.getAttribute('data-group-index')) {
+            target = selectedCells[selectedCells.length - 1];
+        }
         if (this.parent.currentView === 'TimelineYear' && target.classList.contains(cls.OTHERMONTH_CLASS)) {
             return;
         }
@@ -219,7 +224,6 @@ var KeyboardInteraction = /** @class */ (function () {
         if (this.parent.eventWindow) {
             this.parent.eventWindow.convertToEventData(this.parent.activeCellsData, cellData);
         }
-        var selectedCells = this.parent.getSelectedCells();
         var args = {
             data: cellData, element: this.parent.activeCellsData.element, event: e,
             requestType: cellSelect, showQuickPopup: false

package/src/schedule/base/util.d.ts

@@ -176,6 +176,7 @@ export declare function getScrollBarWidth(): number;
  * Method to reset scrollbar width
  *
  * @private
+ * @returns {void}
  */
 export declare function resetScrollbarWidth(): void;
 /**

package/src/schedule/base/util.js

@@ -300,6 +300,7 @@ export function getScrollBarWidth() {
  * Method to reset scrollbar width
  *
  * @private
+ * @returns {void}
  */
 export function resetScrollbarWidth() {
     var zoomPixelRatio = window.devicePixelRatio || window.screen.availWidth / document.documentElement.clientWidth;

package/src/schedule/event-renderer/event-base.d.ts

@@ -58,7 +58,7 @@ export declare class EventBase {
     getEventIDType(): string;
     getEventMaxID(resourceId?: number): number | string;
     private activeEventData;
-    generateOccurrence(event: Record<string, any>, viewDate?: Date, oldTimezone?: string, isMaxCount?: boolean): Record<string, any>[];
+    generateOccurrence(event: Record<string, any>, viewDate?: Date, isMaxCount?: boolean): Record<string, any>[];
     private getDSTAdjustedTime;
     private getDSTDiff;
     getParentEvent(eventObj: Record<string, any>, isParent?: boolean): Record<string, any>;

package/src/schedule/event-renderer/event-base.js

@@ -54,12 +54,12 @@ var EventBase = /** @class */ (function () {
             }
             if (!isNullOrUndefined(event_1[fields.recurrenceRule]) && isNullOrUndefined(event_1[fields.recurrenceID]) &&
                 !(this_1.parent.crudModule && this_1.parent.crudModule.crudObj.isCrudAction)) {
-                processed = processed.concat(this_1.generateOccurrence(event_1, null, oldTimezone, true));
+                processed = processed.concat(this_1.generateOccurrence(event_1, null, true));
             }
             else {
                 if (this_1.parent.crudModule && this_1.parent.crudModule.crudObj.isCrudAction) {
                     if (!isNullOrUndefined(event_1[fields.recurrenceRule]) && isNullOrUndefined(event_1[fields.recurrenceID])) {
-                        var recurrenceEvent = this_1.generateOccurrence(event_1, null, oldTimezone, true);
+                        var recurrenceEvent = this_1.generateOccurrence(event_1, null, true);
                         var _loop_2 = function (occurrence) {
                             var app = this_1.parent.eventsProcessed.filter(function (data) {
                                 return data[fields.startTime].getTime() - occurrence[fields.startTime].getTime() === 0 &&
@@ -879,7 +879,7 @@ var EventBase = /** @class */ (function () {
         }
         this.parent.activeEventData = { event: eventObject, element: target };
     };
-    EventBase.prototype.generateOccurrence = function (event, viewDate, oldTimezone, isMaxCount) {
+    EventBase.prototype.generateOccurrence = function (event, viewDate, isMaxCount) {
         var startDate = event[this.parent.eventFields.startTime];
         var endDate = event[this.parent.eventFields.endTime];
         var eventRule = event[this.parent.eventFields.recurrenceRule];
@@ -894,7 +894,7 @@ var EventBase = /** @class */ (function () {
         var newTimezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         var firstDay = this.parent.activeViewOptions.firstDayOfWeek;
         var calendarMode = this.parent.calendarMode;
-        var dates = generate(startDate, eventRule, exception, firstDay, maxCount, viewDate, calendarMode, oldTimezone, newTimezone);
+        var dates = generate(startDate, eventRule, exception, firstDay, maxCount, viewDate, calendarMode, newTimezone);
         if (this.parent.currentView === 'Agenda' && eventRule.indexOf('COUNT') === -1 && eventRule.indexOf('UNTIL') === -1) {
             if (isNullOrUndefined(event.generatedDates)) {
                 event.generatedDates = { start: new Date(dates[0]), end: new Date(dates[dates.length - 1]) };

package/src/schedule/exports/calendar-import.d.ts

@@ -8,9 +8,10 @@ export declare class ICalendarImport {
     constructor(parent: Schedule);
     initializeCalendarImport(fileContent: Blob | string): void;
     private iCalendarParser;
+    private updateEventData;
     private processOccurrence;
     private getExcludeDateString;
-    private getDateString;
+    private getFormattedString;
     private dateParsing;
     protected getModuleName(): string;
     destroy(): void;

package/src/schedule/exports/calendar-import.js

@@ -24,116 +24,144 @@ var ICalendarImport = /** @class */ (function () {
         }
     };
     ICalendarImport.prototype.iCalendarParser = function (iCalString) {
-        var _this = this;
-        var fields = this.parent.eventFields;
-        var events = [];
-        var uId = 'UID';
-        var calArray = iCalString.replace(new RegExp('\\r', 'g'), '').split('\n');
-        var descriptionIndex = calArray.findIndex(function (line) { return line.startsWith('DESCRIPTION:'); });
-        if (descriptionIndex !== -1) {
-            var description = calArray[descriptionIndex].substring('DESCRIPTION:'.length);
-            for (var i = descriptionIndex + 1; i < calArray.length; i++) {
-                if (calArray[i].startsWith(' ') || !(/[A-Z]{3}:/.test(calArray[i]))) {
-                    description += calArray[i];
-                }
-                else {
-                    calArray[descriptionIndex] = 'DESCRIPTION:' + description;
-                    break;
+        var iCalData = {
+            isEvent: false,
+            curEvent: null,
+            id: this.parent.eventBase.getEventMaxID(),
+            count: 0,
+            events: [],
+            key: null
+        };
+        var iStringLength = iCalString.length;
+        var lastPosition = iCalString.search(/[^ \t]/);
+        var position = lastPosition;
+        var iString;
+        var newlineOffset;
+        do {
+            position = iCalString.indexOf('\n', lastPosition) + 1;
+            if (position === 0) {
+                position = iStringLength;
+                newlineOffset = 0;
+            }
+            else if (position > 1 && iCalString[position - 2] === '\r') {
+                newlineOffset = 2;
+            }
+            else {
+                newlineOffset = 1;
+            }
+            // eslint-disable-next-line security/detect-object-injection
+            var firstChar = iCalString[lastPosition];
+            if (firstChar === ' ' || firstChar === '\n' || firstChar === '\t') {
+                iString += iCalString.slice(lastPosition + 1, position - newlineOffset);
+            }
+            else {
+                if (iString) {
+                    iCalData = this.updateEventData(iString, iCalData);
                 }
+                iString = iCalString.slice(lastPosition, position - newlineOffset);
             }
+            lastPosition = position;
+        } while (position !== iStringLength);
+        iString = iString.trim();
+        if (iString.length) {
+            iCalData = this.updateEventData(iString, iCalData);
         }
-        var isEvent = false;
-        var curEvent;
-        // eslint-disable-next-line prefer-const
-        var id = this.parent.eventBase.getEventMaxID();
-        var count = 0;
-        calArray.forEach(function (element) {
-            var index;
-            var type;
-            var value;
-            if (!isEvent && element === 'BEGIN:VEVENT') {
-                isEvent = true;
-                curEvent = {};
-            }
-            if (isEvent && element === 'END:VEVENT') {
-                isEvent = false;
-                events.push(curEvent);
-                curEvent = null;
-            }
-            if (isEvent) {
-                index = element.indexOf(':');
-                type = element.substr(0, index).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-                value = element.substr(index + 1, element.length - (index + 1)).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-                if (element.indexOf('SUMMARY') !== -1) {
-                    type = 'SUMMARY';
-                }
-                if (element.indexOf('DTSTART') !== -1) {
-                    curEvent[fields.startTime] = _this.dateParsing(element);
-                    curEvent[fields.isAllDay] = _this.allDay;
-                    _this.allDay = false;
-                }
-                else if (element.indexOf('DTEND') !== -1) {
-                    curEvent[fields.endTime] = _this.dateParsing(element);
-                }
-                else if (element.indexOf('EXDATE') !== -1) {
-                    value = getRecurrenceStringFromDate(_this.dateParsing(element));
-                    curEvent[fields.recurrenceException] = (isNullOrUndefined(curEvent[fields.recurrenceException])) ?
-                        value : curEvent[fields.recurrenceException] + ',' + value;
-                }
-                else if (element.indexOf('RECURRENCE-ID') !== -1) {
-                    value = getRecurrenceStringFromDate(_this.dateParsing(element));
-                    curEvent[fields.recurrenceException] = value;
-                    curEvent[fields.recurrenceID] = value;
-                }
-                else {
-                    switch (type) {
-                        case 'BEGIN':
-                            break;
-                        case 'UID':
-                            curEvent["" + uId] = value;
-                            if (typeof (id) == 'number') {
-                                curEvent[fields.id] = parseInt(value, 10);
-                                if (isNaN(curEvent[fields.id])) {
-                                    curEvent[fields.id] = id + count;
-                                    count++;
-                                }
-                            }
-                            else {
-                                curEvent[fields.id] = value;
-                            }
-                            break;
-                        case 'SUMMARY':
-                            curEvent[fields.subject] = value;
-                            break;
-                        case 'LOCATION':
-                            curEvent[fields.location] = value;
-                            break;
-                        case 'DESCRIPTION':
-                            if (!(curEvent[fields.description])) {
-                                curEvent[fields.description] = value.replace(/\\,/g, ',')
-                                    .replace(/\\n/g, '\n');
-                            }
-                            break;
-                        case 'ISREADONLY':
-                            curEvent[fields.isReadonly] = (value.indexOf('true') > -1);
-                            break;
-                        case 'RRULE':
-                            curEvent[fields.recurrenceRule] = value;
-                            break;
-                        default:
-                            if (_this.parent.resourceCollection.length > 0) {
-                                var resData = _this.parent.resourceCollection.filter(function (data) { return data.field === type; });
-                                curEvent["" + type] = (resData.length > 0 && (typeof (resData[0].dataSource[0][resData[0].idField]) == 'number')) ? parseInt(value, 10) : value;
-                            }
-                            else {
-                                curEvent["" + type] = value;
+        var app = extend([], iCalData.events, null, true);
+        this.parent.addEvent(this.processOccurrence(app, iCalData.id));
+    };
+    ICalendarImport.prototype.updateEventData = function (iString, iCalData) {
+        var fields = this.parent.eventFields;
+        var SEPARATOR = '\r\n';
+        var id = iCalData.id;
+        var events = iCalData.events;
+        var isEvent = iCalData.isEvent;
+        var count = iCalData.count;
+        var curEvent = iCalData.curEvent;
+        var key = iCalData.key;
+        if (!isEvent && iString === 'BEGIN:VEVENT') {
+            isEvent = true;
+            curEvent = {};
+        }
+        if (isEvent && iString === 'END:VEVENT') {
+            isEvent = false;
+            events.push(curEvent);
+            curEvent = null;
+        }
+        if (isEvent) {
+            var index = iString.indexOf(':');
+            var type_1 = iString.substring(0, index).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+            var value = iString.substring(index + 1, iString.length).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+            if (iString.indexOf('SUMMARY') !== -1) {
+                type_1 = 'SUMMARY';
+            }
+            if (iString.indexOf('DTSTART') !== -1) {
+                curEvent[fields.startTime] = this.dateParsing(iString);
+                curEvent[fields.isAllDay] = this.allDay;
+                this.allDay = false;
+            }
+            else if (iString.indexOf('DTEND') !== -1) {
+                curEvent[fields.endTime] = this.dateParsing(iString);
+            }
+            else if (iString.indexOf('EXDATE') !== -1) {
+                value = getRecurrenceStringFromDate(this.dateParsing(iString));
+                curEvent[fields.recurrenceException] = isNullOrUndefined(curEvent[fields.recurrenceException]) ?
+                    value : curEvent[fields.recurrenceException] + ',' + value;
+            }
+            else if (iString.indexOf('RECURRENCE-ID') !== -1) {
+                value = getRecurrenceStringFromDate(this.dateParsing(iString));
+                curEvent[fields.recurrenceException] = value;
+                curEvent[fields.recurrenceID] = value;
+            }
+            else {
+                key = type_1 || key;
+                switch (key) {
+                    case 'BEGIN':
+                        break;
+                    case 'UID':
+                        curEvent["" + type_1] = value;
+                        if (typeof (id) == 'number') {
+                            curEvent[fields.id] = parseInt(value, 10);
+                            if (isNaN(curEvent[fields.id])) {
+                                curEvent[fields.id] = id + count;
+                                count++;
                             }
-                    }
+                        }
+                        else {
+                            curEvent[fields.id] = value;
+                        }
+                        break;
+                    case 'SUMMARY':
+                        curEvent[fields.subject] = this.getFormattedString(value);
+                        break;
+                    case 'LOCATION':
+                        curEvent[fields.location] = this.getFormattedString(value);
+                        break;
+                    case 'DESCRIPTION':
+                        if (curEvent[fields.description]) {
+                            curEvent[fields.description] = this.getFormattedString(curEvent[fields.description] + SEPARATOR + value);
+                        }
+                        else {
+                            curEvent[fields.description] = this.getFormattedString(value);
+                        }
+                        break;
+                    case 'ISREADONLY':
+                        curEvent[fields.isReadonly] = (value.indexOf('true') > -1);
+                        break;
+                    case 'RRULE':
+                        curEvent[fields.recurrenceRule] = value;
+                        break;
+                    default:
+                        if (this.parent.resourceCollection.length > 0) {
+                            var resData = this.parent.resourceCollection.filter(function (data) { return data.field === type_1; });
+                            curEvent["" + type_1] = (resData.length > 0 && (typeof (resData[0].dataSource[0][resData[0].idField]) == 'number')) ? parseInt(value, 10) : value;
+                        }
+                        else {
+                            curEvent["" + type_1] = value;
+                        }
                 }
             }
-        });
-        var app = extend([], events, null, true);
-        this.parent.addEvent(this.processOccurrence(app, id));
+        }
+        return { isEvent: isEvent, curEvent: curEvent, id: id, count: count, events: events, key: key };
     };
     ICalendarImport.prototype.processOccurrence = function (app, maxId) {
         var _this = this;
@@ -198,7 +226,7 @@ var ICalendarImport = /** @class */ (function () {
         }
         return parentException + ',' + occurrenceException;
     };
-    ICalendarImport.prototype.getDateString = function (value) {
+    ICalendarImport.prototype.getFormattedString = function (value) {
         value = value || '';
         // eslint-disable-next-line no-useless-escape
         return (value.replace(/\\\,/g, ',').replace(/\\\;/g, ';').replace(/\\[nN]/g, '\n').replace(/\\\\/g, '\\'));
@@ -206,7 +234,7 @@ var ICalendarImport = /** @class */ (function () {
     ICalendarImport.prototype.dateParsing = function (element) {
         var split = element.split(':');
         var value = split[split.length - 1];
-        var newDate = new Date(this.getDateString(value));
+        var newDate = new Date(this.getFormattedString(value));
         if (element && (element.indexOf('VALUE=DATE') > -1 || element.indexOf('RECURRENCE-ID;TZID') > -1)) {
             var data_1 = /^(\d{4})(\d{2})(\d{2})$/.exec(value);
             if (data_1 !== null) {

package/src/schedule/renderer/timeline-view.js

@@ -155,8 +155,11 @@ var TimelineViews = /** @class */ (function (_super) {
         var diffInMinutes = ((date.getHours() - startHour.getHours()) * 60) + (date.getMinutes() - startHour.getMinutes());
         if (!isNullOrUndefined(currentDateIndex)) {
             if (currentDateIndex[0] !== 0) {
-                if (this.parent.activeView.colLevels[0] && this.parent.activeView.colLevels[0][0].colSpan) {
-                    diffInDates = currentDateIndex[0] * this.parent.activeView.colLevels[0][0].colSpan * this.getWorkCellWidth();
+                var index = this.parent.activeView.colLevels.findIndex(function (level) { return level[0].type === 'dateHeader'; });
+                if (this.parent.activeView.colLevels[parseInt(index.toString(), 10)] &&
+                    this.parent.activeView.colLevels[parseInt(index.toString(), 10)][0].colSpan) {
+                    diffInDates = currentDateIndex[0] * this.parent.activeView.colLevels[parseInt(index.toString(), 10)][0].colSpan *
+                        this.getWorkCellWidth();
                 }
                 else {
                     var endHour = this.getEndHour();

package/styles/material-dark.css

@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Roboto:400,500");
+@import url("https://fonts.googleapis.com/css?family=Roboto:400,500,700");
 @keyframes tbar-popup-shadow {
   0% {
     border-color: rgba(255, 255, 255, 0.5);

package/styles/recurrence-editor/material-dark.css

@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Roboto:400,500");
+@import url("https://fonts.googleapis.com/css?family=Roboto:400,500,700");
 .e-ddl.e-control-wrapper .e-ddl-icon::before {
   transform: rotate(0deg);
   transition: transform 300ms ease;

package/styles/schedule/material-dark.css

@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Roboto:400,500");
+@import url("https://fonts.googleapis.com/css?family=Roboto:400,500,700");
 @keyframes tbar-popup-shadow {
   0% {
     border-color: rgba(255, 255, 255, 0.5);