repo: janusweb
action: commit
revision: 
path_from: 
revision_from: b907defe2ff6b3cf35641874ac8387662f679d67:
path_to: 
revision_to: 

commit b907defe2ff6b3cf35641874ac8387662f679d67
Author: James Baicoianu 
Date:   Sun Feb 11 20:31:09 2018 +0000

    Better handling of empty cursor_object

diff --git a/scripts/janusplayer.js b/scripts/janusplayer.js

--- a/scripts/janusplayer.js
+++ b/scripts/janusplayer.js
@@ -605,7 +605,8 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       var obj = ev.target || ev.element;
       var proxyobj = (obj.getProxyObject ? obj.getProxyObject() : obj);

-      if (ev.type == 'mouseover' && (
+
+      if (obj && proxyobj && (ev.type == 'mouseover' || ev.type == 'mousemove') && (
             obj.onclick ||
             elation.events.hasEventListener(obj, 'click') ||
             elation.events.hasEventListener(proxyobj, 'click') ||
@@ -713,6 +714,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
     this.handleGazeLeave = function(ev) {
       var obj = ev.data.object;
       if (obj && obj.dispatchEvent) {
+        this.cursor_object = '';
         obj.dispatchEvent({type: 'gazeleave', data: ev.data.intersection});
       }
     }

-----END OF PAGE-----