Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes an issue with find not returning the correct node #335

Merged
merged 4 commits into from
Sep 3, 2014
Merged

Fixes an issue with find not returning the correct node #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b5ef20
Fixes an issue with find not returning the correct node
scottnc27603 Sep 2, 2014
841e3d3
Fixes an undefined variable
scottnc27603 Sep 2, 2014
0a66ea0
Updates the find method to use a better search algorithm
scottnc27603 Sep 3, 2014
52c50dc
Adds comment for reminder of the find issues
scottnc27603 Sep 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion support/client/lib/vwf/view/kineticjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
52 changes: 46 additions & 6 deletions support/proxy/vwf.example.com/kinetic/drawing.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions support/proxy/vwf.example.com/kinetic/drawing.vwf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ events:
drawingObjectCreated:
textCreated:
imageCreated:
findChild:
scripts:
- source: "http://vwf.example.com/kinetic/drawing.js"