Merge pull request #335 from virtual-world-framework/branch/find-fix

Fixes an issue with find not returning the correct node
virtual-world-framework · Sep 3, 2014 · 9f9d443 · 9f9d443
2 parents 36ceba7 + 52c50dc
commit 9f9d443
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 7 deletions.
diff --git a/support/client/lib/vwf/view/kineticjs.js b/support/client/lib/vwf/view/kineticjs.js
@@ -39,13 +39,15 @@ define( [ "module", "vwf/view", "jquery", "vwf/utility", "vwf/utility/color" ],
             "metaKey": e.evt.metaKey
         } ];
 
+        var stageId = undefined;
         if ( node && node.stage ) {
+            stageId = node.stage.getId();
             returnData.eventData.stage = [ node.stage.x, node.stage.y ];    
         }
 
         if ( propagate ) {
 
-            var pointerPickID = e.targetNode ? e.targetNode.getId() : stage.getId();
+            var pointerPickID = e.targetNode ? e.targetNode.getId() : stageId;
 
             returnData.eventNodeData = { "": [ {
                 pickID: pointerPickID,

diff --git a/support/proxy/vwf.example.com/kinetic/drawing.js b/support/proxy/vwf.example.com/kinetic/drawing.js
diff --git a/support/proxy/vwf.example.com/kinetic/drawing.vwf.yaml b/support/proxy/vwf.example.com/kinetic/drawing.vwf.yaml
@@ -25,5 +25,6 @@ events:
   drawingObjectCreated:
   textCreated:
   imageCreated:
+  findChild:
 scripts:
 - source: "http://vwf.example.com/kinetic/drawing.js"