@sapui5/sap.ui.vbm 1.96.2 → 1.96.4

package/package.json

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

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

@@ -23,7 +23,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.96.2
+	 * @version 1.96.4
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -42,7 +42,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.96.2
+	 * @version 1.96.4
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

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

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.4
 	 * @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

@@ -378,7 +378,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.4
 	 * @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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.4
 	 * @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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.4
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -907,6 +907,7 @@ sap.ui.define([
 		material = material || new THREE.MeshPhongMaterial({
 			specular: 0x444444,
 			shininess: 0,
+			opacity: 0.99,
 			transparent: true,
 			depthTest: true,
 			depthWrite: false,
@@ -926,6 +927,7 @@ sap.ui.define([
 
 		var geometry = new THREE.DecalGeometry(target, origin, this._decalHelper.rotation, size);
 		instance.object3D = new THREE.Mesh(geometry, material);
+		instance.object3D.renderOrder = 100;
 		instance.object3D.matrixAutoUpdate = false;
 		instance.object3D.layers.set(1); // put it to layer #1 to disable hit test
 		this._scene.add(instance.object3D);

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.4
 	 * @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

@@ -678,18 +678,24 @@ VBI.Scene = function(target) {
 			}
 			// standard case - click on single object
 			if (event.hitTests.length > 0) {
-				event.hitCached = event.hitTests[0];
-				var obj = event.hitCached.m_Vo;
-				delete event.hitTests; //has to be deleted to avoid collecting hits information again
-				return obj["on" + eventType].call(obj, event);
+				event.hitCached = event.hitTests[0]; // cache first hit test
+				delete event.hitTests; // has to be deleted to avoid collecting hits information again
+				// if there is a VO then pass event to it
+				if (event.hitCached.m_Vo) {
+					return event.hitCached.m_Vo["on" + eventType].call(event.hitCached.m_Vo, event);
+				} else {
+					delete event.hitCached; // remove it to keep things going "old" way
+				}
+			} else {
+				return false; // not handled
 			}
-		} else { // old approach -> process from last to first which corresponds to the rendering order (from topmost to last)
-			for (var i = scene.m_VOS.length - 1;  i >= 0; --i) {
-				if ((func = scene.m_VOS[i]["on" + eventType]) && typeof (func) == 'function') {
-					// call the handler with the context set to corresponded visual object
-					if (func.call(scene.m_VOS[i], event)) {
-						return true; // handled
-					}
+		}
+		// "old" approach -> process from last to first which corresponds to the rendering order (from topmost to last)
+		for (var i = scene.m_VOS.length - 1;  i >= 0; --i) {
+			if ((func = scene.m_VOS[i]["on" + eventType]) && typeof (func) == 'function') {
+				// call the handler with the context set to corresponded visual object
+				if (func.call(scene.m_VOS[i], event)) {
+					return true; // handled
 				}
 			}
 		}

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

@@ -1223,7 +1223,7 @@ VBI.VisualObjects = function() {
 			}
 			// check for design handle context menu subscription.............//
 			var action, actions = scene.m_Ctx.m_Actions;
-			if (actions && ocb.m_Design && ocb.m_Handle > -1) {
+			if (actions && ocb.m_Design && (ocb.m_Handle > -1 || ocb.m_Hit === VBI.HTBOX)) {
 				// the action is raised whenever a design action has stopped..//
 				// for the instanced type.....................................//
 				// is it a HandleMoved or a HandleClick action ...............//

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.96.4
 	 * @public
 	 */
 
@@ -43,7 +43,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.96.2"
+		version: "1.96.4"
 	});
 
 	sap.ui.loader.config({

package/src/sap/ui/vbm/themes/sap_belize_hcb/AnalyticMap.less

@@ -0,0 +1,4 @@
+
+.sapUiVbmAnalyticMap {
+	background-color: @sapUiBaseBG;
+}

package/src/sap/ui/vbm/themes/sap_belize_hcb/VBI.less

@@ -0,0 +1,96 @@
+
+.vbi-detail {
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-closebutton
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-content
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-phone
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail > .vbi-detail-arrow.vbi-detail-left
+{
+	border-right-color: @sapUiBaseBG;
+}
+
+.vbi-detail > .vbi-detail-header
+{
+   font-size: @sapUiFontHeader4Size;
+   font-family: @sapUiFontHeaderFamily;
+   font-weight: @sapUiFontHeaderWeight;
+   color: @sapTextColor; 
+}
+
+.vbi-detail-header-phone
+{
+   font-family: @sapUiFontHeaderFamily;
+   font-weight: @sapUiFontHeaderWeight;
+   color: @sapTextColor;
+}
+
+.vbi-legend {
+	box-shadow: lighten(@sapUiContentForegroundColor, 20%) 0rem 0rem 0.9rem 0.0625rem;
+	font-family: @sapUiFontFamily;
+	background-color: @sapUiBaseBG;
+	color: @sapTextColor;
+}
+
+.vbi-legend > .vbi-legend-header
+{
+   font-size: @sapMFontMediumSize;
+}
+
+.vbi-legend-button-col:hover
+{
+	background-color: @sapUiHighlight;
+}
+
+.vbi-legend-button-col:active
+{
+	background-color: darken(@sapUiHighlight, 20%);
+}
+
+.vbi-legend-button-exp:hover
+{
+	background-color: @sapUiHighlight;
+}
+
+.vbi-legend-button-exp:active
+{
+	background-color: darken(@sapUiHighlight, 20%);
+}
+
+.vbi-legend-table
+{
+	font-size: @sapMFontSmallSize;
+}
+
+.vbi-legend-table-click
+{
+	tr:hover {
+		background-color: @sapUiHighlight;
+	};
+	tr:active {
+		background-color: darken(@sapUiHighlight, 20%);
+	};
+}
+
+.vbi-legend-content-celltext
+{
+	color: @sapUiChartLegendLabelFontColor;
+}
+
+.vbi-legend-content-celldiv-square
+{
+	border-color: @sapUiContentForegroundColor;
+}

package/src/sap/ui/vbm/themes/sap_belize_hcb/library.source.less

@@ -5,4 +5,7 @@
 
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_belize_hcb/base.less";
-@import "../../../../../sap/ui/core/themes/sap_belize_hcb/global.less";
+@import "../../../../../sap/ui/core/themes/sap_belize_hcb/global.less";
+
+@import "AnalyticMap.less";
+@import "VBI.less";