@sapui5/sap.ui.vbm 1.97.0 → 1.98.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.97.0",
+  "version": "1.98.0",
   "description": "SAPUI5 Library sap.ui.vbm",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/vbm/.library

@@ -3,7 +3,7 @@
 	<name>sap.ui.vbm</name>
 	<vendor>SAP SE</vendor>
 	<copyright>SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved</copyright>
-	<version>1.97.0</version>
+	<version>1.98.0</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 

package/src/sap/ui/vbm/Adapter.js

@@ -22,13 +22,12 @@ sap.ui.define([
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new object
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.vbm.Adapter
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
-	 * @experimental Since 1.48.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	var Adapter = Element.extend("sap.ui.vbm.Adapter", /** @lends sap.ui.vbm.Adapter.prototype */ {
 		metadata: {
@@ -102,6 +101,32 @@ sap.ui.define([
 			"start",
 			"tooltip"];
 
+		this._areaProperties = [
+			"key", //K: VoBase
+			"color", //C: Area, OBJECT_BASE_DATA->FILL_COLOR
+			"colorBorder", //D/CB: Area, OBJECT_BASE_DATA->BORDER_COLOR
+			"posarray", //H, PM (multipart) /P: Area, AREA_EXTENSION->BORDER_POINTS
+			"selectColor", //SC: OBJECT_BASE_DATA->SELECT_COLOR
+			"dragdata", //DD: VoAggregation, OBJECT_BASE_DATA->DRAG_DATA
+			"VB:s", //VB:s: elected, OBJECT_BASE_DATA->SELECTED
+			"VB:c", //H/VB:c: VoAggregation (changeable) OBJECT_BASE_DATA->CHANGEABLE
+			"hotScale", //HS: VoAggregation
+			"hotDeltaColor", //HC/HDC: VoAggregation, OBJECT_BASE_DATA->HOT_COLOR
+			"borderDash", //BD: Area
+			"selectColor", //SC: VoAggregation
+			"fxdir", //FD: VoAggregation
+			"fxsize", //FS: VoAggregation
+			"entity", //ET: VoAggregation
+			"labelBgColor", //LC/LBC: VoAggregation
+			"labelBorderColor", //LBBC: VoAggregation
+			"labelPos",  //LP: VoAggregation
+			"labelText", //LT: VoAggregation
+			"labelArrow", //??VOBase
+			"label", //L
+			"labelAlignment", //"LA"
+			"tooltip" //B/TT: VoAggregation
+		];
+
 			// Allowed Spot properties
 		this._spotProperties = [
 			"alignment",
@@ -474,6 +499,7 @@ sap.ui.define([
 		 * 	"Set": [
 		 * 		{ "name": "Spots", "type": "N", ....},
 		 *      { "name": "Links", "type": "N", ....},
+		 *      { "name": "Areas", "type": "N", ....},
 		 * 	]
 		 * }
 		 *
@@ -483,6 +509,7 @@ sap.ui.define([
 		 *			"N": [
 		 *				{ "name": "Spots", ... },
 		 *				{ "name": "Links", ... },
+		 *              { "name": "Areas", ... },
 		 *			]
 		 *		}
 		 *	}
@@ -787,13 +814,18 @@ sap.ui.define([
 						processDragAndDrop();
 						break;
 					case "{00100000-2012-0004-B001-F311DE491C77}": // Area
+						processProperties(this._areaProperties, this._propsAnomalies);
+						voTemplate = new sap.ui.vbm.Area(settings);
+						voAggregation = new sap.ui.vbm.Areas(this._ui5Id(definition.id));
+						processDragAndDrop();
+						break;
+					case "{00100000-2014-0004-BDA8-87B904609063}": // "ExtArea" GUID??? from sapvobase
+					case "{00100000-2014-0004-B001-9F1B43BE944A}": // "ExtLink" GUID??? from sapvobase
 					case "{00100000-2013-0004-B001-7EB3CCC039C4}": // Circle
 					case "{00100000-2013-0004-B001-686F01B57873}": // Geo Circle
 					case "{00100000-2012-0004-B001-BFED458C3076}": // Box
 					case "{00100000-2012-0004-B001-383477EA1DEB}": // Pie Chart
 					case "{388951f5-a66b-4423-a5ad-e0ee13c2246f}": // Decal
-					case "ExtLink": // GUID???
-					case "ExtArea": // GUID???
 					default:
 						Log.debug("unsupported VO type", definition.type, thisModule);
 						return;
@@ -917,6 +949,9 @@ sap.ui.define([
 			case "Drop":
 				this._event = "drop";
 				break;
+			case "CreateComplete":
+				this._event = "createComplete";
+				break;
 			case "Select":
 				this._event = "select";
 				break;
@@ -1473,12 +1508,15 @@ sap.ui.define([
 			}
 			if (oEventData.Action && oEventData.Action.object) {
 				// Whatever back-end refers to as Links, they are referred to as Routes by Geomap
-				if (oEventData.Action.object === "Route") {
-					oEventData.Action.object = "Link";
+				var routeName = "Route", linkName = "Link";
+				var actionObjects = [oEventData.Action.object];
+				if (oEventData.Action.object === routeName) {
+					actionObjects.push(linkName);
+					oEventData.Action.object = linkName;
 				}
 
 				var oAction = sap.ui.vbm.findInArray(this._actions, function(action) {
-					return oEventData.Action.object === action.refVO && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
+					return (actionObjects.indexOf(action.refVO) != -1) && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
 				});
 
 				if (oAction) {

package/src/sap/ui/vbm/Adapter3D.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new object
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

package/src/sap/ui/vbm/GeoMap.js

@@ -1058,7 +1058,8 @@ sap.ui.define([
 				case "click":
 					// fire the click..................................................//
 					this.fireClick({
-						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
+						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "contextMenu":
@@ -1073,7 +1074,8 @@ sap.ui.define([
 				case "drop":
 					// fire the drop..................................................//
 					this.fireDrop({
-						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
+						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "zoomChanged":
@@ -1084,7 +1086,8 @@ sap.ui.define([
 						viewportBB: {
 							upperLeft: datEvent.Action.Params.Param[3]['#'],
 							lowerRight: datEvent.Action.Params.Param[4]['#']
-						}
+						},
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "centerChanged":
@@ -1095,7 +1098,8 @@ sap.ui.define([
 						viewportBB: {
 							upperLeft: datEvent.Action.Params.Param[3]['#'],
 							lowerRight: datEvent.Action.Params.Param[4]['#']
-						}
+						},
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "select":
@@ -1121,6 +1125,12 @@ sap.ui.define([
 							this.mIACreateCB = null;
 							throw exc;
 						}
+					} else {
+						// If interactive editing was triggered indirectly (e.g. via vbiJSON load) then fire event
+						datEvent.Action.name = "CreateComplete";
+						//include VBI data to the UI5 event payload
+						this.fireEvent("createComplete", {data: datEvent}, true);
+						e.preventDefault();
 					}
 					break;
 				case "keydown":
@@ -2226,4 +2236,4 @@ sap.ui.define([
 
 	return GeoMap;
 
-}, /* bExport= */true);
+}, /* bExport= */true);

package/src/sap/ui/vbm/Viewport.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */

package/src/sap/ui/vbm/adapter3d/ModelHandler.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @alias sap.ui.vbm.adapter3d.ModelHandler
 	 */	
 	var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {

package/src/sap/ui/vbm/adapter3d/ObjectFactory.js

@@ -377,7 +377,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @alias sap.ui.vbm.adapter3d.ObjectFactory
 	 */
 	var ObjectFactory = BaseObject.extend("sap.ui.vbm.adapter3d.ObjectFactory", /** @lends sap.ui.vbm.adapter3d.ObjectFactory.prototype */ {});

package/src/sap/ui/vbm/adapter3d/PolygonHandler.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
 	 */	
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {

package/src/sap/ui/vbm/adapter3d/SceneBuilder.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -351,6 +351,8 @@ sap.ui.define([
 
 				var iframe = document.createElement("iframe");
 				iframe.style.visibility = "hidden";
+				// use sandbox attribute to disable script execution and all other suspicious activities in iframe as we cannot affectively escape input HTML.
+				iframe.sandbox = "allow-same-origin";
 				iframe.width = width;
 				iframe.height = height;
 				document.body.appendChild(iframe);

package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @alias sap.ui.vbm.adapter3d.VBIJSONParser
 	 */
 	var VBIJSONParser = BaseObject.extend("sap.ui.vbm.adapter3d.VBIJSONParser", /** @lends sap.ui.vbm.adapter3d.VBIJSONParser.prototype */ {

package/src/sap/ui/vbm/lib/sapscene.js

@@ -3351,7 +3351,7 @@ VBI.GeoScene = function(target, mapmanager, maplayerstack) {
 		}
 		var sCopyright = scene.m_MapLayerStack.GetCopyright();
 		if (sCopyright) {
-			scene.m_DivCopyright.innerHTML = sCopyright;
+			scene.m_DivCopyright.innerHTML = jQuery.sap.encodeHTML(sCopyright);
 		} else {
 			scene.m_DivCopyright.style.paddingRight = 0;
 			scene.m_DivCopyright.style.paddingLeft = 0;

package/src/sap/ui/vbm/lib/saputilities.js

@@ -270,7 +270,7 @@ VBI.Utilities.CreateCaption = function(id, text, left, top, right, bottom, toolt
 	}
 
 	newElement.className = "vbi-2d-caption vbi-2d-common";
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	return newElement;
 };
 
@@ -286,7 +286,7 @@ VBI.Utilities.CreateLabel = function(id, text, left, top, right, bottom, tooltip
 	newElement.style.textAlign = VBI.Utilities.Align[align];
 	newElement.style.title = tooltip;
 	newElement.className = "vbi-2d-label vbi-2d-common";
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	return newElement;
 };
 
@@ -303,7 +303,7 @@ VBI.Utilities.CreateLink = function(id, text, left, top, right, bottom, href, to
 	newElement.className = "vbi-2d-link vbi-2d-common";
 	newElement.href = href ? href : "javascrip" + "t:void(0)"; // separated to fool ESLint
 	newElement.title = tooltip;
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	return newElement;
 };
 
@@ -333,7 +333,7 @@ VBI.Utilities.CreateButton = function(id, text, left, top, right, bottom, toolti
 	newElement.style.height = (bottom - top).toString() + "px";
 	newElement.style.textAlign = VBI.Utilities.Align[align];
 	newElement.className = "vbi-2d-button vbi-2d-common";
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	newElement.title = tooltip;
 	return newElement;
 };
@@ -390,7 +390,7 @@ VBI.Utilities.CreateDetailPhone = function(id, left, top, width, height, titlete
 	title.setAttribute("role", sap.ui.core.AccessibleRole.Heading);
 	title.id = id + "-window-title";
 	title.className = "vbi-detail-title-phone";
-	title.innerHTML = titletext;
+	title.innerHTML = jQuery.sap.encodeHTML(titletext);
 	header.appendChild(title);
 
 	// create the close.......................................................//
@@ -476,7 +476,7 @@ VBI.Utilities.CreateDetail = function(id, left, top, width, height, titletext, p
 	title.setAttribute("role", sap.ui.core.AccessibleRole.Heading);
 	title.id = id + "-window-title";
 	title.className = "vbi-detail-title";
-	title.innerHTML = titletext;
+	title.innerHTML = jQuery.sap.encodeHTML(titletext);
 	header.appendChild(title);
 
 	// create the close.......................................................//
@@ -601,7 +601,7 @@ VBI.Utilities.CreateLegend = function(id, top, titletext, padding, bClickRow) {
 	title.setAttribute("role", sap.ui.core.AccessibleRole.Heading);
 	title.id = id + "-title";
 	title.className = "vbi-legend-title";
-	title.innerHTML = titletext;
+	title.innerHTML = jQuery.sap.encodeHTML(titletext);
 	header.appendChild(title);
 
 	// create the content.....................................................//

package/src/sap/ui/vbm/lib/sapvbi.js

@@ -105,7 +105,7 @@ sap.ui.define(function() {
 			if (trace == null) {
 				return;
 			}
-			VBI.m_Log = VBI.m_Log + text + "<br>";
+			VBI.m_Log = VBI.m_Log + jQuery.sap.encodeHTML(text) + "<br>";
 			trace.innerHTML = VBI.m_Log;
 		},
 

package/src/sap/ui/vbm/library.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.97.0
+	 * @version 1.98.0
 	 * @public
 	 */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 			"sap.ui.vbm.ClusterBase", "sap.ui.vbm.ClusterTree", "sap.ui.vbm.ClusterGrid", "sap.ui.vbm.ClusterDistance", "sap.ui.vbm.Heatmap",
 			"sap.ui.vbm.HeatPoint", "sap.ui.vbm.ClusterContainer", "sap.ui.vbm.Adapter", "sap.ui.vbm.Adapter3D"
 		],
-		version: "1.97.0"
+		version: "1.98.0"
 	});
 
 	sap.ui.loader.config({