dhtmlx-scheduler 5.3.11 → 5.3.14

package/codebase/sources/dhtmlxscheduler.js

@@ -1,7 +1,7 @@
 /*
 
 @license
-dhtmlxScheduler v.5.3.11 Standard
+dhtmlxScheduler v.5.3.14 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 sales@dhtmlx.com
 
@@ -1953,7 +1953,7 @@ Scheduler.plugin = function (code) {
 };
 Scheduler._schedulerPlugins = [];
 Scheduler.getSchedulerInstance = function () {
-	var scheduler = { version: "5.3.11" };
+	var scheduler = { version: "5.3.14" };
 
 var commonViews = {
 	agenda: "https://docs.dhtmlx.com/scheduler/agenda_view.html",
@@ -2674,7 +2674,9 @@ scheduler.select=function(id){
 	if (this._select_id==id) return;
 	scheduler._close_not_saved();
 	this.editStop(false);
-	this.unselect();
+	if(this._select_id){
+		this.unselect();
+	}
 	this._select_id = id;
 	this.updateEvent(id);
 	this.callEvent("onEventSelected", [id]);
@@ -2731,7 +2733,7 @@ scheduler._click={
 				scheduler._click.buttons[mask.split(" ")[1].replace("icon_","")](id);
 		} else{
 			scheduler._close_not_saved();
-			if (new Date().valueOf()-(scheduler._new_event||0) > 500){
+			if (scheduler.getState().select_id && new Date().valueOf()-(scheduler._new_event||0) > 500){
 				scheduler.unselect();
 			}
 		}
@@ -3450,7 +3452,7 @@ scheduler.update_view=function(){
 
 	var view = this[this._mode + "_view"];
 	if(view){
-		view(true);
+		view.call(this, true);
 	}else{
 		this._reset_scale();
 	}
@@ -4264,6 +4266,32 @@ scheduler.eventRemove = function(el, event, handler){
 		].join(", "));
 
 		var nodesArray = Array.prototype.slice.call(nodes, 0);
+		
+		for(var i = 0; i < nodesArray.length; i++){
+			nodesArray[i].$position = i;
+			// we remember original nodes order, 
+			// so when we sort them by tabindex we ensure order of nodes with same tabindex is preserved, 
+			// since some browsers do unstable sort
+		}
+		
+		nodesArray.sort(function(a, b) {
+			if(a.tabIndex === 0 && b.tabIndex !== 0){
+				return 1;
+			}
+			if(a.tabIndex !== 0 && b.tabIndex === 0){
+				return -1;
+			}
+			
+			if (a.tabIndex === b.tabIndex){
+				// ensure we do stable sort
+				return a.$position - b.$position;
+			}
+			if (a.tabIndex < b.tabIndex) {
+				return -1;
+			}
+			return 1;
+		});
+		
 		for(var i = 0; i < nodesArray.length; i++){
 			var node = nodesArray[i];
 			var isValid = (hasNonNegativeTabIndex(node)  || isEnabled(node) || hasHref(node)) && isVisible(node);
@@ -5577,6 +5605,9 @@ scheduler.addEvent = function(start_date, end_date, text, id, extra_data) {
 	if (ev.start_date.valueOf() == ev.end_date.valueOf())
 		ev.end_date.setTime(ev.end_date.valueOf() + d);
 
+	ev.start_date.setMilliseconds(0);
+	ev.end_date.setMilliseconds(0);
+
 	ev._timed = this.isOneDayEvent(ev);
 
 	var is_new = !this._events[ev.id];
@@ -5591,7 +5622,9 @@ scheduler.deleteEvent = function(id, silent) {
 	if (!silent && (!this.callEvent("onBeforeEventDelete", [id, ev]) || !this.callEvent("onConfirmedBeforeEventDelete", [id, ev])))
 		return;
 	if (ev) {
-		this._select_id = null;
+		if(scheduler.getState().select_id == id){
+			scheduler.unselect();
+		}
 		delete this._events[id];
 		this.event_updated(ev);
 
@@ -5677,7 +5710,7 @@ scheduler.is_visible_events = function(ev) {
 			lastHour = this.config.last_hour,
 			firstHour = this.config.first_hour;
 
-		var end_dates_visible = (this._table_view || !((evLastHour > lastHour || evLastHour < firstHour) && (evFirstHour >= lastHour || evFirstHour < firstHour)));
+		var end_dates_visible = (this._table_view || !((evLastHour > lastHour || evLastHour <= firstHour) && (evFirstHour >= lastHour || evFirstHour < firstHour)));
 
 		if(end_dates_visible){
 			return true;
@@ -5687,7 +5720,7 @@ scheduler.is_visible_events = function(ev) {
 			var event_duration = (ev.end_date.valueOf() - ev.start_date.valueOf()) / (1000*60*60),//hours
 				hidden_duration = 24 - (this.config.last_hour - this.config.first_hour);
 
-			return !!((event_duration > hidden_duration) || (evFirstHour < lastHour && evLastHour >= firstHour));
+			return !!((event_duration > hidden_duration) || (evFirstHour < lastHour && evLastHour > firstHour));
 
 		}
 	}else{
@@ -6781,8 +6814,11 @@ scheduler.showEvent = function(id, mode) {
 
 	scheduler.setCurrentView(new Date(ev.start_date), mode);
 
-	ev.color = original_color;
-	ev.textColor = original_text_color;
+	function restoreOriginalColors(){
+		ev.color = original_color;
+		ev.textColor = original_text_color;
+	}
+
 	scheduler.config.scroll_hour = scroll_hour;
 	scheduler.config.preserve_scroll = preserve_scroll;
 
@@ -6806,11 +6842,24 @@ scheduler.showEvent = function(id, mode) {
 			var container = scheduler.$container.querySelector(".dhx_timeline_data_wrapper");
 			left = left - (container.offsetWidth - timeline.dx) / 2;
 			top = top - container.offsetHeight / 2 + timeline.dy/2;
+
+			if (timeline._smartRenderingEnabled()) {
+				var handlerId = timeline.attachEvent("onScroll", function(){
+					restoreOriginalColors();
+					timeline.detachEvent(handlerId);
+				});
+			}
+
 			timeline.scrollTo({
 				left: left,
 				top: top
 			});
+			if (!timeline._smartRenderingEnabled()) {
+				restoreOriginalColors();
+			}
 		}
+	}else{
+		restoreOriginalColors();
 	}
 
 	scheduler.callEvent("onAfterEventDisplay", [ev, mode]);
@@ -7342,13 +7391,22 @@ scheduler.attachEvent("onXLE", function() {
 scheduler._lightbox_controls = {};
 scheduler.formSection = function(name){
 	var config = this.config.lightbox.sections;
-	var i =0;
-	for (i; i < config.length; i++)
-		if (config[i].name == name)
+	var i = 0;
+	for (i; i < config.length; i++) {
+		if (config[i].name == name) {
 			break;
+		}
+	}
+
+	if (i === config.length) {
+		// GS-1662 section not found, should exit here instead of throwing an error
+		return null;
+	}
+
 	var section = config[i];
-	if (!scheduler._lightbox)
+	if (!scheduler._lightbox) {
 		scheduler.getLightbox();
+	}
 	var header = document.getElementById(section.id);
 	var node = header.nextSibling;
 
@@ -7611,6 +7669,11 @@ scheduler.form_blocks={
 
 			if(cfg.auto_end_date && cfg.event_duration) {
 				var _update_lightbox_select = function () {
+					
+					if (!(cfg.auto_end_date && cfg.event_duration)){
+						// setting may be disabled after the handler is attached
+						return;
+					}
 					start_date = new Date(s[map[3]].value,s[map[2]].value,s[map[1]].value,0,s[map[0]].value);
 					end_date = new Date(start_date.getTime() + (scheduler.config.event_duration * 60 * 1000));
 					_fill_lightbox_select(s, 4, end_date);
@@ -7788,7 +7851,6 @@ scheduler._empty_lightbox=function(data){
 scheduler.hide_lightbox=function(id){
 	scheduler.endLightbox(false, this.getLightbox());
 };
-scheduler.hideLightbox = scheduler.hide_lightbox;
 
 scheduler.hideCover=function(box){
 	if (box) box.style.display="none";
@@ -7852,9 +7914,14 @@ scheduler.resetLightbox = function(){
 	scheduler._lightbox = null;
 };
 scheduler.cancel_lightbox=function(){
-	this.callEvent("onEventCancel",[this._lightbox_id, this._new_event]);
+	if(this._lightbox_id){
+		this.callEvent("onEventCancel",[this._lightbox_id, this._new_event]);
+	}
+
 	this.hide_lightbox();
 };
+scheduler.hideLightbox = scheduler.cancel_lightbox;// GS-1650 need to use cancel in order to fire onEventCancel event, which is important to refresh the state of recurring series
+
 scheduler._init_lightbox_events=function(){
 	this.getLightbox().onclick=function(e){
 		var src=e?e.target:event.srcElement;