Commit f47abc96 authored by Rurik Bugdanov's avatar Rurik Bugdanov

merge

parents 3be8d1f8 6d22b1ba
......@@ -950,8 +950,19 @@ X3DOMObject.PointerMarker.prototype._registerEvents = function(){
var self = this;
var Camera = Map.marker;
self._shape.on("click",function(e){
// PointerMarker MouseEvent are not triggered when isPickable is false
$(window).on('mousedown',function(e){
self._shape.attr('isPickable',true);
});
$(window).on('mouseup',function(){
self._shape.attr('isPickable',false);
});
// window mousedown above is run after x3dom mousedown handler
// so we must listen to x3dom 'mouseup' instead of 'click' below
self._shape.on("mouseup",function(e){
X3DOMObject.Marker.dehighlight(self._elem);
var xyz = $(this).parent().attr("translation");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment