@sapui5/sap.ui.vbm 1.84.6 → 1.84.9

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.VoAbstract.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.VoAggregation.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.VoBase.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.adapter3d.ModelHandler
@@ -31,9 +31,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.6
+	 * @version 1.84.9
 	 * @alias sap.ui.vbm.adapter3d.ModelHandler
-	 */	
+	 */
 	var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
 
 		constructor: function(resources, textures, scene, root) {
@@ -96,11 +96,14 @@ sap.ui.define([
 		this._textures = null;
 		this._scene = null;
 		this._root = null;
+		this._hotInstance = null;
 
 		// destroy 'meta' meshes
-		this._meshes.forEach(function(mesh) {
-			mesh.objects3D.forEach(function(object) {
-				this._deleteObject3D(object);
+		this._meshes.forEach(function(array) {
+			array.forEach(function(item) {
+				item.objects3D.forEach(function(object) {
+					this._deleteObject3D(object);
+				}, this);
 			}, this);
 		}, this);
 
@@ -110,15 +113,23 @@ sap.ui.define([
 				subRef(instance.texture);
 			}
 		});
-		
+
 		// destroy models
 		this._models.forEach(function(model, resource) {
 			this._deleteModel(model);
 		}, this);
 
 		this._meshes.clear();
+		this._meshes = null;
+
 		this._instances.clear();
+		this._instances = null;
+
 		this._models.clear();
+		this._models = null;
+
+		this._glTFLoader = null;
+		this._colladaLoader = null;
 
 		BaseObject.prototype.destroy.call(this);
 	};
@@ -148,7 +159,7 @@ sap.ui.define([
 	 * @param {object} instance Model instance.
 	 * @public
 	 */
-	ModelHandler.prototype.updateInstance = function(instance) { 
+	ModelHandler.prototype.updateInstance = function(instance) {
 		var data = this._instances.get(instance), update = false, hot = this._hotInstance && this._hotInstance === instance;
 		if (data) {
 			var normalized = Utilities.toBoolean(instance.normalize);
@@ -187,7 +198,7 @@ sap.ui.define([
 				}
 				update = true;
 			}
-			
+
 			// when model normalization changed -> update model properties -> reset instance model matrices
 			if (propertyChanged(instance, ["normalize", "model"])) {
 				this._updateModel(data.model, normalized);
@@ -219,9 +230,9 @@ sap.ui.define([
 			if (data.matrices.length === 0) {
 				var world = this._root.matrixWorld.clone(); // start from the _root
 				world.multiply(data.world); // apply instance world matrix
-				
+
 				// if instance normalized -> apply normalized model root matrix as otherwise (non normalized case) model root has identity matrix
-				if (normalized) { 
+				if (normalized) {
 					world.multiply(data.model.normalized.world);
 				}
 				// apply individual mesh matrices from the model at last
@@ -255,7 +266,7 @@ sap.ui.define([
 			this._instances.delete(instance);
 			this._removeInstanceFromMesh(data);
 			instance._last = {}; // reset all LRU variables at once
-			
+
 			if (data.model) {
 				subRef(data.model); // model can be null if removing 'broken' instance
 			}
@@ -430,7 +441,7 @@ sap.ui.define([
 	ModelHandler.prototype._postprocess = function(model, content) {
 		// mirror on Z axis entire collada root which is effectively the same as collada processing with baking transformations and inverting Z coordinates in ActiveX
 		model.scene.scale.set(1,1,-1);
-		
+
 		var meshes = [], materials = new Set(), marked = "_sapUsed";
 		// collect meshes only + calculate world matrix, mark used materials & maps
 		model.scene.traverse(function(object) {
@@ -560,7 +571,7 @@ sap.ui.define([
 			// remove instanced mesh from scene
 			if (object.parent) {
 				object.parent.remove(object);
-			}			
+			}
 			// geometries are shared -> cannot dispose
 			Utilities.toArray(object.material).forEach(function(material) {
 				material.dispose(); // materials are cloned -> can be disposed, maps are shared -> don't touch, cannot be disposes
@@ -584,7 +595,7 @@ sap.ui.define([
 			// target has to be added to _root to mimic original model and must have same world matrix as original model
 			// so we calculate world matrix for target which will be under _root and not under _scene as instance mesh
 			var world = data.world.clone(); // use instance world as starting point
-			if (data.model.normalized) { 
+			if (data.model.normalized) {
 				world.multiply(data.model.normalized.world);
 			}
 			world.multiply(data.model.root.children[0].matrixWorld);

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the base visual object.
@@ -378,7 +378,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.6
+	 * @version 1.84.9
 	 * @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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.adapter3d.PolygonHandler
@@ -34,9 +34,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.6
+	 * @version 1.84.9
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
-	 */	
+	 */
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {
 
 		constructor: function(root) {
@@ -99,7 +99,7 @@ sap.ui.define([
 	PolygonHandler.prototype.destroy = function() {
 		// Reset references to shared objects.
 		this._root = null;
-		this._instances.clear();
+		this._hotInstance = null;
 
 		// destroy 'meta' meshes
 		this._meshes.forEach(function(key, array) {
@@ -114,10 +114,16 @@ sap.ui.define([
 				this._deleteObject3D(border.object3D);
 			}, this);
 		}, this);
-		
+
 		// clear
+		this._instances.clear();
+		this._instances = null;
+
 		this._meshes.clear();
+		this._meshes = null;
+
 		this._borders.clear();
+		this._borders = null;
 
 		BaseObject.prototype.destroy.call(this);
 	};
@@ -137,11 +143,11 @@ sap.ui.define([
 
 	/**
 	 * Adds polygon instance to polygon handler.
-	 * 
+	 *
 	 * @param {object} instance Polygon instance.
 	 * @public
 	 */
-	PolygonHandler.prototype.addInstance = function(instance) { 
+	PolygonHandler.prototype.addInstance = function(instance) {
 		this._instances.set(instance, {
 			instance : instance,
 			indices: [],
@@ -161,11 +167,11 @@ sap.ui.define([
 
 	/**
 	 * Updates polygon instance in polygon handler
-	 * 
+	 *
 	 * @param {object} instance Polygon instance.
 	 * @public
 	 */
-	PolygonHandler.prototype.updateInstance = function(instance) { 
+	PolygonHandler.prototype.updateInstance = function(instance) {
 		var data = this._instances.get(instance), updateMesh = false, updateBorder = false;
 		if (data) {
 			// position, rotation, scale [mandatory attributes] when change -> recalculate matrix
@@ -188,7 +194,7 @@ sap.ui.define([
 			}
 
 			// if any property which affects polygon color changed -> check if polygon color actually changed
-			// then update polygon color and remove polygon from current 'meta' mesh if it exists 
+			// then update polygon color and remove polygon from current 'meta' mesh if it exists
 			// and put it into another 'meta' mesh according to polygon updated color
 			// color, selectColor, VB:s [mandatory attributes]
 			if (propertyChanged(instance, ["color", "selectColor", "VB:s"])) {
@@ -329,13 +335,13 @@ sap.ui.define([
 					// create 3 or 2 groups, depends on where hot instance geometry is within 'meta' mesh geometry
 					geometry.addGroup(range.start, data.indices.length, 1); // use hot material with index #1
 
-					if (range.start !== 0) { 
+					if (range.start !== 0) {
 						geometry.addGroup(0, range.start, 0); // use original material with index #0
 					}
 					if (range.start + data.indices.length < geometry.index.count) {
 						geometry.addGroup(range.start + data.indices.length, geometry.index.count - range.start - data.indices.length, 0); // use original material with index #0
 					}
-				} 
+				}
 			}
 			if (data.border) { // apply hover on polygon border geometry
 				material = data.border.material;
@@ -365,13 +371,13 @@ sap.ui.define([
 					var vertexCount = data.lines.length/3;
 					geometry.addGroup(range.start, vertexCount, 1); // use hot material with index #1
 
-					if (range.start !== 0) { 
+					if (range.start !== 0) {
 						geometry.addGroup(0, range.start, 0); // use original material with index #0
 					}
 					if (range.start + vertexCount < positions.count) {
 						geometry.addGroup(range.start + vertexCount, positions.count - range.start - vertexCount, 0); // use original material with index #0
 					}
-				} 
+				}
 			}
 		} else {
 			log.error("Unable to find polygon instance data", "", thisModule);
@@ -430,7 +436,7 @@ sap.ui.define([
 
 	/**
 	 * Updates 'meta' meshes requested for rebuild by combining geometry of all instances with the same color into one mesh.
-	 * 
+	 *
 	 * @returns {boolean} True if hot instance 'meta' mesh has been recreated.
 	 * @private
 	 */
@@ -441,11 +447,11 @@ sap.ui.define([
 			for (var i = 0; i < array.length;) {
 				if (array[i].dirty) {
 					var j, instance, base, indices = [], vertices = [], normals = [], data = array[i];
-					
+
 					this._deleteObject3D(data.object3D);
 					data.object3D = null;
 					data.hitInfo.length = 0; // erase hitInfo
-	
+
 					data.instances.forEach(function(range, key) {
 						instance = key; // to access instance outside forEach
 
@@ -481,24 +487,24 @@ sap.ui.define([
 
 					if (indices.length) {
 						var geometry = new THREE.BufferGeometry();
-					
+
 						geometry.setIndex(indices);
 						geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
 						geometry.setAttribute("normal", new THREE.Float32BufferAttribute(normals, 3));
 						geometry.computeBoundingBox(); // needed for ray casting
 						geometry.computeBoundingSphere(); // needed for ray casting
-						
+
 						var material = createMaterial(true);
 						material.color.copy(instance.color.rgb);
 						material.opacity = instance.color.opacity;
 						material.transparent = material.opacity < 1;
 						material.needsUpdate = true;
-		
+
 						data.object3D = new THREE.Mesh(geometry, material);
 						data.object3D.matrixAutoUpdate = false;
 						data.object3D.layers.set(0); // put it to layer #0 to enable raycasting
 						this._root.add(data.object3D);
-	
+
 						data.object3D._instanceHitTest = this._instanceHitTest.bind(data); // helper function to return instance based on hit test info
 						data.triangleCount = indices.length/3; // update triangle count on full rebuild
 					}
@@ -529,7 +535,7 @@ sap.ui.define([
 
 	/**
 	 * Updates 'meta' borders requested for rebuild by combining geometry of all instances with the same color into one mesh.
-	 * 
+	 *
 	 * @returns {boolean} True if hot instance 'meta' border has been recreated.
 	 * @private
 	 */
@@ -567,13 +573,13 @@ sap.ui.define([
 						var geometry = new THREE.BufferGeometry();
 						geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
 						geometry.computeBoundingBox();
-		
+
 						var material = createLineMaterial();
 						material.color.copy(instance.colorBorder.rgb);
 						material.opacity = instance.colorBorder.opacity;
 						material.transparent = material.opacity < 1;
 						material.needsUpdate = true;
-		
+
 						data.object3D = new THREE.LineSegments(geometry, material);
 						data.object3D.matrixAutoUpdate = false;
 						data.object3D.layers.set(1); // put it to layer #1 to disable hit test
@@ -741,10 +747,10 @@ sap.ui.define([
 		if (object) {
 			if (object.parent) {
 				object.parent.remove(object);
-			}			
+			}
 			if (object.geometry) {
 				object.geometry.dispose();
-			}		
+			}
 			Utilities.toArray(object.material).forEach(function(material) {
 				material.dispose(); // no maps to dispose
 			});

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the base visual object.
@@ -9,7 +9,7 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"./Utilities",
 	"./PolygonHandler",
-	"./ModelHandler",	
+	"./ModelHandler",
 	"./thirdparty/three",
 	"./thirdparty/DecalGeometry",
 	"./thirdparty/html2canvas"],
@@ -50,7 +50,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.6
+	 * @version 1.84.9
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -107,9 +107,11 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		this._scene = null;
 		this._viewport = null;
 		this._context = null;
+		this._hotInstance = null;
+
 
 		if (this._box4) {
-			this._box.dispose();
+			this._box4.dispose();
 		}
 		if (this._box6) {
 			this._box6.dispose();
@@ -125,15 +127,22 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 			this._decalHelper.material.dispose();
 			this._decalHelper.geometry.dispose();
 			this._scene.remove(this._decalHelper);
+			this._decalHelper = null;
 		}
 
 		this._polygonHandler.destroy();
+		this._polygonHandler = null;
+
 		this._modelHandler.destroy();
+		this._modelHandler = null;
 
 		this._textures.forEach(function(texture) {
 			texture.dispose();
 		});
 
+		this._targets.clear();
+		this._targets = null;
+
 		BaseObject.prototype.destroy.call(this);
 	};
 
@@ -194,7 +203,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 			[].concat(toAdd, toUpdate).forEach(function(instance) {
 				if (instance.isModel) {
 					that._modelHandler.addModel(instance);
-				} 
+				}
 				if (instance.texture && propertyChanged(instance, "texture")) {
 					addTexture(instance.texture);
 				}
@@ -313,7 +322,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		var state = {
 			zoom: 1.0,
 			// convert from left handed (DirectX) to right handed (OpenGL)
-			target: new Vector3(-camTarget.x, -camTarget.z, camTarget.y), 
+			target: new Vector3(-camTarget.x, -camTarget.z, camTarget.y),
 			position: new Vector3(-pos.x, -pos.z, pos.y)
 		};
 
@@ -355,6 +364,8 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 
 				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);
@@ -578,7 +589,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		// var timestamp = performance.now();
 		this._polygonHandler.updateHotInstance(instance);
 		this._modelHandler.updateHotInstance(instance);
-		
+
 		// perform pending updates if any
 		this._polygonHandler.update();
 		this._modelHandler.update();
@@ -590,7 +601,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		if (instance) {
 			this._updateHotStatus(instance, true);
 		}
-		
+
 		this._hotInstance = instance;
 		// DEBUG
 		// log.info("update hover took " + (performance.now() - timestamp)  + " milliseconds", "", thisModule);
@@ -613,9 +624,9 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 				box.layers.set(0); // put it to layer #0 to enable raycasting
 				box._sapInstance = instance; // keep reference to instance
 				instance.object3D.add(box);
-			} 
+			}
 		}
-		
+
 		// update properties after processing is done
 		updateProperty(instance, "texture6");
 
@@ -664,7 +675,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 				cylinder.layers.set(0); // put it to layer #0 to enable raycasting
 				cylinder._sapInstance = instance; // keep reference to instance
 				instance.object3D.add(cylinder);
-			} 
+			}
 		}
 
 		if (propertyChanged(instance, "textureCap") || updateTextureCap) {
@@ -687,12 +698,12 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 				}
 			}
 		}
-		
+
 		// update cylinder properties after processing is done
 		updateProperty(instance, ["isOpen", "testureCap"]);
 
 		// handle common properties
-		this._assignProperties(instance, hot);		
+		this._assignProperties(instance, hot);
 	};
 
 	SceneBuilder.prototype._assignProperties = function(instance, hot) {
@@ -816,9 +827,9 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 				Utilities.subRef(material.map); // release current texture in use
 				material.map = null;
 			}
-			
+
 			material.map = this._textures.get(instance.text ? this._getDecalTextKey(instance) : instance.texture);
-			
+
 			if (material.map) {
 				material.map.flipY = true;
 				material.needsUpdate = true; // required by threeJS
@@ -827,7 +838,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 				log.error("Unable to apply texture, texture not found", instance.texture, thisModule);
 			}
 		}
-		
+
 		// update properties after processing is done
 		updateProperty(instance, ["position", "direction", "size", "rotation", "target", "texture", "text", "planeOrigin", "planeNormal"]);
 	};
@@ -903,6 +914,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		material = material || new THREE.MeshPhongMaterial({
 			specular: 0x444444,
 			shininess: 0,
+			opacity: 0.99,
 			transparent: true,
 			depthTest: true,
 			depthWrite: false,
@@ -924,6 +936,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		// this._scene.add(cube);
 
 		instance.object3D = new THREE.Mesh(new THREE.DecalGeometry(target, origin, this._decalHelper.rotation, size), 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);
@@ -992,7 +1005,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 
 	SceneBuilder.prototype._getDecalTarget = function(instance) {
 		if (instance.target) {
-			var target = this._targets.get(instance.target);	
+			var target = this._targets.get(instance.target);
 			if (target) {
 				if (target.isBox || target.isCylinder) {
 					return target.object3D.children[0]; // object3d is a group node, where its first child is actual mesh

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the base visual object.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.adapter3d.VBIJSONParser
@@ -58,7 +58,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.6
+	 * @version 1.84.9
 	 * @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

@@ -673,18 +673,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
 				}
 			}
 		}
@@ -3352,7 +3358,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;