@sapui5/sap.ui.vbm 1.120.0 → 1.121.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.120.0",
+  "version": "1.121.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.120.0</version>
+	<version>1.121.0</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 

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

@@ -22,7 +22,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.120.0
+	 * @version 1.121.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -396,12 +396,12 @@ sap.ui.define([
 		 *
 		 * */
 		var findAttribute = function(a, name) {
-			var oEntry = sap.ui.vbm.findInArray(this._dataTypes, function(_dt) { return _dt.name == name; });
+			var oEntry = library.findInArray(this._dataTypes, function(_dt) { return _dt.name == name; });
 
 			if ((oEntry == null) || !(oEntry.A)) {
 				return undefined;
 			} else {
-				var oAttr = sap.ui.vbm.findInArray(oEntry.A, function(_a) { return _a.alias == a; });
+				var oAttr = library.findInArray(oEntry.A, function(_a) { return _a.alias == a; });
 				if (oAttr != null) {
 					return oAttr.name;
 				} else {
@@ -466,7 +466,7 @@ sap.ui.define([
 
 			if (this._data[e["n.name"]].some(function(_d) {return _d.Key == e.K;})) {
 				// The instance (Spot) already exists - modify it
-				var index = sap.ui.vbm.findIndexInArray(this._data[e["n.name"]], function(_d) { return _d.Key === e.K; });
+				var index = library.findIndexInArray(this._data[e["n.name"]], function(_d) { return _d.Key === e.K; });
 				if (index !== -1) {
 					this._data[e["n.name"]][index] = d;
 				}
@@ -481,7 +481,7 @@ sap.ui.define([
 				return (r.N && r.N.E);
 			}).forEach(function(r) {
 				[].concat(r.N.E).forEach(function(e) {
-					var index = sap.ui.vbm.findIndexInArray(this._data[r.name], function(_d) { return _d.Key === e.K; });
+					var index = library.findIndexInArray(this._data[r.name], function(_d) { return _d.Key === e.K; });
 
 					if (index !== -1) {
 						this._data[r.name].splice(index, 1);
@@ -606,7 +606,7 @@ sap.ui.define([
 				var oGoogleTileApiSourcesByApiKey = aGoogleTileApiSources.reduce(function(g, a) {
 					var apiKey = a.url.split("key=")[1];
 					g[apiKey] = g[apiKey] || [];
-					if (sap.ui.vbm.findIndexInArray(apiKeys, function(k) { return k === apiKey; } ) === -1) {
+					if (library.findIndexInArray(apiKeys, function(k) { return k === apiKey; } ) === -1) {
 						apiKeys.push(apiKey);
 					}
 					g[apiKey].push(a);
@@ -831,7 +831,7 @@ sap.ui.define([
 						return;
 				}
 
-				var index = sap.ui.vbm.findIndexInArray(this._dataTypes, function(_d) { return _d.name === definition.datasource; });
+				var index = library.findIndexInArray(this._dataTypes, function(_d) { return _d.name === definition.datasource; });
 
 				if (index !== -1) {
 					var dataType = this._dataTypes[index];
@@ -910,7 +910,7 @@ sap.ui.define([
 			this._target = this._adapter._map();
 		} else {
 			var id = this._adapter._ui5Id(this.refVO);
-			this._target = sap.ui.vbm.findInArray(this._adapter._map().getVos(), function(vo) { return vo.getId() === id; }); // find target VO
+			this._target = library.findInArray(this._adapter._map().getVos(), function(vo) { return vo.getId() === id; }); // find target VO
 
 			if (!this._target) { // if not found check cluster VOs as well
 				this._target = this._adapter._clusterVOs.get(this.refVO);
@@ -1005,7 +1005,7 @@ sap.ui.define([
 		this._actions.splice(index, 1);
 		// when both click & double click present -> when removing double click -> click must be activated
 		if (remove.refEvent === "DoubleClick") {
-			var click = sap.ui.vbm.findInArray(this._actions, function(action) { return action.refVO === remove.refVO && action.refEvent === "Click"; });
+			var click = library.findInArray(this._actions, function(action) { return action.refVO === remove.refVO && action.refEvent === "Click"; });
 			if (click) {
 				click.attach();
 			}
@@ -1028,7 +1028,7 @@ sap.ui.define([
 			}
 		} else if (def.refEvent === "DoubleClick") {
 			// if click is there already -> detach it (but keep in the list) and attach double click instead
-			var click = sap.ui.vbm.findInArray(this._actions, function(action) { return action.refVO === def.refVO && action.refEvent === "Click"; }, this);
+			var click = library.findInArray(this._actions, function(action) { return action.refVO === def.refVO && action.refEvent === "Click"; }, this);
 			if (click) {
 				click.detach();
 			}
@@ -1057,7 +1057,7 @@ sap.ui.define([
 				list = [].concat(actions.Remove);
 			}
 			list.forEach(function(def) {
-				index = sap.ui.vbm.findIndexInArray(this._actions, function(action) { return action.id === def.id });
+				index = library.findIndexInArray(this._actions, function(action) { return action.id === def.id });
 				if (index !== -1) {
 					this._removeAction(index);
 				} else {
@@ -1074,7 +1074,7 @@ sap.ui.define([
 			}
 
 			list.forEach(function(def) { // update or create actions by id
-				index = sap.ui.vbm.findIndexInArray(this._actions, function(action) { return action.id === def.id });
+				index = library.findIndexInArray(this._actions, function(action) { return action.id === def.id });
 				if (index !== -1) {
 					this._removeAction(index);
 				}
@@ -1369,7 +1369,7 @@ sap.ui.define([
 							if (sAttribute.startsWith("pos")) {
 								var aParameters = wnd.Window[sAttribute].split(".");
 								if (aParameters[0] in oModelData) {
-									var index = sap.ui.vbm.findIndexInArray(oModelData[aParameters[0]], findPredicate("Key", aParameters[1]));
+									var index = library.findIndexInArray(oModelData[aParameters[0]], findPredicate("Key", aParameters[1]));
 
 									if (index !== -1) {
 										var oData = oModelData[aParameters[0]][index];
@@ -1400,12 +1400,12 @@ sap.ui.define([
 							if (s.name && s.type) {
 								var oDataList = s[s.type];
 								if (oDataList.name === s.name) {
-									var oDataType = sap.ui.vbm.findInArray([].concat(this._dataTypes), findPredicate("name", oDataList.name));
-									var sAlias = sap.ui.vbm.findInArray([].concat(sap.ui.vbm.findInArray([].concat(oDataType.N), findPredicate("name", aParameters[2])).A),
+									var oDataType = library.findInArray([].concat(this._dataTypes), findPredicate("name", oDataList.name));
+									var sAlias = library.findInArray([].concat(library.findInArray([].concat(oDataType.N), findPredicate("name", aParameters[2])).A),
 											findPredicate("name", aParameters[4])).alias;
 
 									var oData = [].concat(oDataList.E)[aParameters[1]];
-									var oSubData = [].concat(sap.ui.vbm.findInArray([].concat(oData.N), findPredicate("name", aParameters[2])).E)[aParameters[3]];
+									var oSubData = [].concat(library.findInArray([].concat(oData.N), findPredicate("name", aParameters[2])).E)[aParameters[3]];
 
 									oVO[sAttribute.split(".")[0]] = oSubData[sAlias];
 									delete oVO[sAttribute];
@@ -1530,7 +1530,7 @@ sap.ui.define([
 					oEventData.Action.object = linkName;
 				}
 
-				var oAction = sap.ui.vbm.findInArray(this._actions, function(action) {
+				var oAction = library.findInArray(this._actions, function(action) {
 					return (actionObjects.indexOf(action.refVO) != -1) && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
 				});
 
@@ -1601,7 +1601,7 @@ sap.ui.define([
 					 */
 					[].concat(oAction.AddActionProperty || []).forEach(function(a) {
 						var addActionProperties = oEventData.Action.AddActionProperties.AddActionProperty || [];
-						var propertyValue = sap.ui.vbm.findInArray(
+						var propertyValue = library.findInArray(
 							[].concat(addActionProperties),
 							function(prop) { return prop.name === a.name; });
 
@@ -1666,7 +1666,7 @@ sap.ui.define([
 		} else {
 			// This needs to be done since by the time callback (event handler) is executed, the object is reclaimed.
 			// if this handler is for cluster -> need to find corresponded click (if any) and pass it through
-			var click = clusterAction ? sap.ui.vbm.findInArray(this._actions, function(action) { return action.refVO === clusterAction.refVO && action.refEvent === "Click"; }) : undefined;
+			var click = clusterAction ? library.findInArray(this._actions, function(action) { return action.refVO === clusterAction.refVO && action.refEvent === "Click"; }) : undefined;
 			this.oEvent = jQuery.extend(true, {}, event);
 			this.timeout = setTimeout(this._handler.bind(this, this.oEvent, click), 500);
 		}

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

@@ -45,7 +45,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.120.0
+	 * @version 1.121.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -432,11 +432,11 @@ sap.ui.define([
 	Adapter3D.prototype._processDetailWindow = function(payload) {
 		// show first only detail window from toAdd queue
 		// ignore all other detail windows as we can show only one at a time in compare to ActiveX implementation
-		var window = sap.ui.vbm.findInArray(this._context.windowQueues.toAdd, function(window) {
+		var window = library.findInArray(this._context.windowQueues.toAdd, function(window) {
 			return window.type === "callout";
 		});
 
-		var scene = window && sap.ui.vbm.findInArray(this._context.scenes, function(scene) {
+		var scene = window && library.findInArray(this._context.scenes, function(scene) {
 			return scene.id === window.refScene;
 		});
 
@@ -764,7 +764,7 @@ sap.ui.define([
 
 		var instance = event.instance;
 		var groupId = instance ? instance.voGroup.id : event.voGroupId;
-		var actionDefinition = sap.ui.vbm.findInArray(this._context.actions, function(action) { return action.refVO === groupId && action.refEvent === name; });
+		var actionDefinition = library.findInArray(this._context.actions, function(action) { return action.refVO === groupId && action.refEvent === name; });
 
 		if (actionDefinition) {
 			var param = [];
@@ -1096,7 +1096,7 @@ sap.ui.define([
 		onBeforeRendering: function(event) {
 			if (this._onhoverProxy) {
 				this._viewport.$().off("wheel", this._onhoverProxy);
-				this._viewport.$().off(sap.ui.Device.browser.msie || sap.ui.Device.browser.edge ? "pointermove" : "mousemove", this._onhoverProxy);
+				this._viewport.$().off("mousemove", this._onhoverProxy);
 			}
 			if (this._onpointerdownProxy) {
 				this._viewport.$().off("pointerdown", this._onpointerdownProxy);
@@ -1111,18 +1111,7 @@ sap.ui.define([
 				this._onhoverProxy = viewportEventDelegate.onhover.bind(this);
 			}
 			this._viewport.$().on("wheel", this._onhoverProxy);
-			this._viewport.$().on(sap.ui.Device.browser.msie || sap.ui.Device.browser.edge ? "pointermove" : "mousemove", this._onhoverProxy);
-
-			if (sap.ui.Device.browser.msie || sap.ui.Device.browser.edge) {
-				if (!this._onpointerdownProxy) {
-					this._onpointerdownProxy = viewportEventDelegate.onmousedown.bind(this);
-				}
-				this._viewport.$().on("pointerdown", this._onpointerdownProxy);
-				if (!this._onpointerupProxy) {
-					this._onpointerupProxy = viewportEventDelegate.onmouseup.bind(this);
-				}
-				this._viewport.$().on("pointerup", this._onpointerupProxy);
-			}
+			this._viewport.$().on("mousemove", this._onhoverProxy);
 
 			if (this._detail.anchor) { // restore DOM hierarchy by adding anchor element under viewport DOM element
 				this._viewport.getDomRef().appendChild(this._detail.anchor);
@@ -1132,7 +1121,7 @@ sap.ui.define([
 		}
 	};
 
-	viewportEventDelegate[sap.ui.Device.browser.msie || sap.ui.Device.browser.edge ? "onclick" : "ontap"] = function(event) {
+	viewportEventDelegate["ontap"] = function(event) {
 		Log.trace("onclick", "", thisModule);
 		this._extendEventWithInstance(event);
 		if (this._skipClick) {

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

@@ -278,7 +278,8 @@ sap.ui.define([
 		var oUri = window.URI(AnalyticMap.DefaultABAPGeoJSONURL); // abap system
 		oUri.addQuery("sap-language", sap.ui.getCore().getConfiguration().getLanguage()); // append the language parameter to the uri
 		aPathGeoJSON[1] = oUri.toString();
-		aPathGeoJSON[2] = sap.ui.resource("sap.ui.vbm", AnalyticMap.DefaultGeoJSONURL); // default path
+		aPathGeoJSON[2] = sap.ui.require.toUrl("sap/ui/vbm/"+AnalyticMap.DefaultGeoJSONURL); // default path
+						
 
 		for (var mI = 0; mI < 3; ++mI) {
 			sPathGeoJSON = aPathGeoJSON[mI];
@@ -965,7 +966,7 @@ sap.ui.define([
 	};
 
 	AnalyticMap.prototype.applyTheming = function(aRegions) {
-		if (sap.ui.core.theming && Parameters) { // only if theming parameters are available
+		if (Parameters) { // only if theming parameters are available
 			var sColC = AnalyticMap.DefaultRegionColor;
 			if (Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBG") != undefined) {
 				sColC = AnalyticMap.DefaultRegionColor = Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBG");