@sapui5/sap.gantt 1.120.6 → 1.120.7

package/src/sap/gantt/simple/GanttChartWithTable.js

@@ -168,7 +168,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @since 1.60
 	 *
 	 * @constructor
@@ -3844,6 +3844,7 @@ sap.ui.define([
 
 		var oPrimaryScheme = this.getPrimaryShapeScheme();
 
+		this._syncRowExpandState(vRowIndex, bExpanded, bPseudoShapeExpand);
 		this._bExpandToggled = this._oExpandModel.isTableRowHeightNeedChange(bExpanded, this.getTable(), aIndices, oPrimaryScheme, aExpandScheme);
 		if (this._bExpandToggled) {
 			if (this.getEnablePseudoShapes()){
@@ -3851,6 +3852,8 @@ sap.ui.define([
 			}
 			this._createInnerGanttRenderPromise();
 			this.getTable().invalidate();
+		} else {
+			this._syncRowExpandState(vRowIndex, !bExpanded, bPseudoShapeExpand);
 		}
 	};
 
@@ -4580,6 +4583,37 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * sync the row expand state with the row settings
+	 * @param {number} vRowIndex  row indices
+	 * @param {boolean} bExpanded whether is to expand or not
+	 * @param {boolean} bPseudoShapeExpand whether pseudo shape is enabled or not
+	 * @private
+	 */
+	GanttChartWithTable.prototype._syncRowExpandState = function(vRowIndex, bExpanded, bPseudoShapeExpand) {
+		var aRows = this.getTable().getRows(), aRowIndices = [];
+
+		if (typeof vRowIndex === "number") {
+			aRowIndices = [vRowIndex];
+		} else if (Array.isArray(vRowIndex)) {
+			aRowIndices = vRowIndex;
+		}
+
+		var iStartIndex = aRows[0].getIndex();
+
+		aRowIndices.forEach(function(iIndex){
+			var oRow = aRows[iIndex - iStartIndex];
+			var oRowSettings = oRow && oRow.getAggregation("_settings");
+
+			if (oRowSettings) {
+				oRowSettings._onRowExpandToggle({
+					expanded: bExpanded,
+					pseudoShapeExpand: bPseudoShapeExpand
+				});
+			}
+		});
+	};
+
 	return GanttChartWithTable;
 
 }, true);

package/src/sap/gantt/simple/GanttDragDropExtension.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttExtension
@@ -349,6 +349,10 @@ sap.ui.define([
 				endTime: oDraggedShape.getEndTime()
 			};
 
+			if (this.oSourceRow) {
+				this.oSourceRow.destroy();
+			}
+
 			//Set SourceRow = Row instance from where the shape is dragged
 			this.oSourceRow = this.getRowByShape(oDraggedShape);
 
@@ -369,6 +373,9 @@ sap.ui.define([
 			this._bEnableRowHighlight = oDraggedShape.getDragHighlightRows().length > 0 && !this.bMultipleGhosts;
 
 			DragDropHelper.addDragDropEventListeners(this.getGantt());
+		} else if (this.oSourceRow) {
+			this.oSourceRow.destroy();
+			this.oSourceRow = undefined;
 		}
 	};
 

package/src/sap/gantt/simple/GanttExtension.js

@@ -18,7 +18,7 @@ sap.ui.define([ "sap/ui/base/Object" ],function(BaseObject) {
 		 * @abstract
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.120.7
 		 * @constructor
 		 * @private
 		 * @alias sap.gantt.simple.GanttExtension

package/src/sap/gantt/simple/GanttHeader.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @private

package/src/sap/gantt/simple/GanttPointerExtension.js

@@ -240,7 +240,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttPointerExtension

package/src/sap/gantt/simple/GanttPopoverExtension.js

@@ -79,7 +79,7 @@ function(
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttPopoverExtension

package/src/sap/gantt/simple/GanttPrinting.js

@@ -146,7 +146,7 @@ sap.ui.define([
 		 * @extend sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.120.7
 		 * @since 1.66
 		 *
 		 * @constructor
@@ -2583,7 +2583,8 @@ sap.ui.define([
 				}
 
 				var oGanttChartSvg = this._oDomToPrint[counter].getElementsByClassName("sapGanttChartSvg")[0].cloneNode(true);
-				var oGanttChartSvgDef = this._oDomToPrint[counter].getElementsByClassName("sapGanttChartSvgDefs")[0].cloneNode(true);
+				var oSvgDefs = this._getOriginalGanttChart().getDomRef() ? this._getOriginalGanttChart().getDomRef().getElementsByClassName("sapGanttChartSvgDefs") : null;
+				var oGanttChartSvgDef = (oSvgDefs && oSvgDefs.length > 0) ? oSvgDefs[0].cloneNode(true) : null;
 
 				//Redrawing the vertical lines
 				if (oGanttChartSvg.getElementsByClassName("sapGanttChartVerticalLine") && oGanttChartSvg.getElementsByClassName("sapGanttChartVerticalLine").length) {

package/src/sap/gantt/simple/GanttRowAction.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.RowAction
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @experimental

package/src/sap/gantt/simple/GanttRowSettings.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.RowSettings
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public
@@ -286,5 +286,34 @@ sap.ui.define([
 		return this;
 	};
 
+	GanttRowSettings.prototype._onRowExpandToggle = function(oExpandInfo) {
+		if (!oExpandInfo) {
+			return;
+		}
+
+		if (this._oRowExpandInfo && (this._oRowExpandInfo.expanded === oExpandInfo.expanded && this._oRowExpandInfo.pseudoShapeExpand === oExpandInfo.pseudoShapeExpand)) {
+			return;
+		}
+
+		this._oRowExpandInfo = oExpandInfo;
+
+		if (this._isExpanded()) {
+			this._handleEvent(new jQuery.Event("RowExpanded"));
+		} else {
+			this._handleEvent(new jQuery.Event("RowCollapsed"));
+		}
+	};
+
+	GanttRowSettings.prototype._isExpanded = function() {
+		return this._oRowExpandInfo && (this._oRowExpandInfo.expanded && !this._oRowExpandInfo.pseudoShapeExpand);
+	};
+
+	GanttRowSettings.prototype.clone = function () {
+		var oClone = TableRowSettings.prototype.clone.call(this);
+		oClone._oRowExpandInfo = this._oRowExpandInfo;
+
+		return oClone;
+	};
+
 	return GanttRowSettings;
 });

package/src/sap/gantt/simple/GanttUtils.js

@@ -94,7 +94,7 @@ sap.ui.define([
 				nTimeX = oShape.getXByTime(vTime);
 			}
 
-			if (!jQuery.isNumeric(nTimeX)) {
+			if (!Utility.isNumeric(nTimeX)) {
 				Log.warning("couldn't convert timestamp to x with value: " + vTime);
 			}
 

package/src/sap/gantt/simple/GanttZoomExtension.js

@@ -77,7 +77,7 @@ sap.ui.define([
 				oGanttDom = mDom.gantt,
 				oHeaderSvg = mDom.headerSvg;
 			var fnBindEventToDom = function(sEventName, oDom) {
-				jQuery(oDom).bind(sEventName, GanttZoomHelper.dispatch.bind(oGantt));
+				jQuery(oDom).on(sEventName, GanttZoomHelper.dispatch.bind(oGantt));
 			};
 
 			// before binding events, first clear all to prevent duplicate event registered
@@ -159,9 +159,9 @@ sap.ui.define([
 				oGanttSvg = mDom.ganttSvg,
 				oGanttDom = mDom.gantt,
 				oHeaderSvg = mDom.headerSvg;
-			jQuery(oGanttSvg).unbind(sNameSpace);
-			jQuery(oHeaderSvg).unbind(sNameSpace);
-			jQuery(oGanttDom).unbind(sNameSpace);
+			jQuery(oGanttSvg).off(sNameSpace);
+			jQuery(oHeaderSvg).off(sNameSpace);
+			jQuery(oGanttDom).off(sNameSpace);
 			jQuery(document).off(sNameSpace);
 
 		}

package/src/sap/gantt/simple/InnerGanttChart.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @private

package/src/sap/gantt/simple/LegendContainer.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/LegendShapeGroup.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @since 1.84
 	 *
 	 * @constructor

package/src/sap/gantt/simple/MultiActivityGroup.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/gantt/simple/BaseGroup"], function (BaseGroup) {
      * @extends sap.gantt.simple.BaseGroup
      *
      * @author SAP SE
-     * @version 1.120.6
+     * @version 1.120.7
      * @since 1.85
      *
      * @constructor

package/src/sap/gantt/simple/MultiActivityRowSettings.js

@@ -21,7 +21,7 @@
 	 * @extends sap.gantt.simple.GanttRowSettings
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @since 1.85
      *
 	 * @constructor

package/src/sap/gantt/simple/Relationship.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BasePath
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/ShapeScheme.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element'], function (Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/StockChart.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.UtilizationChart
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @since 1.95
 	 *
 	 * @constructor

package/src/sap/gantt/simple/StockChartDimension.js

@@ -23,7 +23,7 @@ sap.ui.define([
  * @extends sap.ui.core.Element
  *
  * @author SAP SE
- * @version 1.120.6
+ * @version 1.120.7
  * @since 1.95
  *
  * @constructor

package/src/sap/gantt/simple/StockChartPeriod.js

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/UtilizationBarChart.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.UtilizationChart
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/UtilizationChart.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @abstract

package/src/sap/gantt/simple/UtilizationDimension.js

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/UtilizationLineChart.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.UtilizationChart
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/UtilizationPeriod.js

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/shapes/Shape.js

@@ -6,11 +6,14 @@
  */
 sap.ui.define([
 	"sap/gantt/simple/BaseShape",
-	"sap/ui/thirdparty/jquery",
 	"sap/gantt/misc/Format",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/core/Core"
-], function (BaseShape, jQuery, Format, Parameters, Core) {
+	"sap/ui/core/Core",
+	"sap/gantt/utils/GanttChartConfigurationUtils",
+	"sap/ui/core/RenderManager",
+	"sap/gantt/misc/Utility"
+], function (BaseShape, Format, Parameters, Core,
+	GanttChartConfigurationUtils, RenderManager, Utility) {
 	"use strict";
 
 	var DEFAULT_ROW_PADDING = 12;
@@ -30,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @abstract
 	 * @constructor
@@ -217,7 +220,7 @@ sap.ui.define([
 		var startTime = oAxisTime.timeToView(Format.abapTimestampToDate(this.getTime())),
 			endTime = oAxisTime.timeToView(Format.abapTimestampToDate(this.getEndTime()));
 
-		if (jQuery.isNumeric(startTime) && jQuery.isNumeric(endTime)) {
+		if (Utility.isNumeric(startTime) && Utility.isNumeric(endTime)) {
 			return Math.abs(endTime - startTime);
 		} else {
 			return 0;

package/src/sap/gantt/simple/shapes/Task.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.shapes.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public