Missing 3.x api for event object

cytoscape · May 4, 2017 · 4894c46 · 4894c46
1 parent a2e7686
commit 4894c46
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cytoscape-qtip.js b/cytoscape-qtip.js
@@ -246,7 +246,7 @@ SOFTWARE.
       var isNode = isEle && ele.isNode();
       var cy = isCy ? ele : ele.cy();
       var cOff = cy.container().getBoundingClientRect();
-      var pos = isNode ? ele.renderedPosition() : ( e ? e.cyRenderedPosition : undefined );
+      var pos = isNode ? ele.renderedPosition() : ( e ? e.renderedPosition || e.cyRenderedPosition : undefined );
       if( !pos || pos.x == null || isNaN(pos.x) ){ return; }
 
       var bb = isNode ? ele.renderedBoundingBox({
@@ -355,15 +355,15 @@ SOFTWARE.
       qtip.$domEle.removeData('qtip'); // remove qtip dom/api ref to be safe
 
       cy.on( opts.show.event, function(e){
-        if( !opts.show.cyBgOnly || (opts.show.cyBgOnly && e.cyTarget === cy) ){
+        if( !opts.show.cyBgOnly || (opts.show.cyBgOnly && (e.target === cy || e.cyTarget === cy)) ){
           updatePosition(cy, qtip, e);
 
           qtipApi.show();
         }
       } );
 
       cy.on( opts.hide.event, function(e){
-        if( !opts.hide.cyBgOnly || (opts.hide.cyBgOnly && e.cyTarget === cy) ){
+        if( !opts.hide.cyBgOnly || (opts.hide.cyBgOnly && (e.target === cy || e.cyTarget === cy)) ){
           qtipApi.hide();
         }
       } );