diff options
| author | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
| commit | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (patch) | |
| tree | da417684de5e302d302ea617854015bd9a8ca17a /js/helper-classes/3D/snap-manager.js | |
| parent | d7d78d4a4e8cf82c56379d25efbe679b3b823abc (diff) | |
| parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
| download | ninja-dc3c813320c8d3fb837d5d18e70ab35a53b116c1.tar.gz | |
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
| -rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 94202dc5..372be345 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
| @@ -597,7 +597,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | // TODO - Don't traverse components' children | 599 | // TODO - Don't traverse components' children |
| 600 | if(elt.elementModel && elt.elementModel.isComponent) | 600 | // if(elt.elementModel && elt.elementModel.isComponent) |
| 601 | if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG")))) | ||
| 601 | { | 602 | { |
| 602 | return; | 603 | return; |
| 603 | } | 604 | } |
| @@ -1007,7 +1008,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1007 | } | 1008 | } |
| 1008 | 1009 | ||
| 1009 | // TODO - Don't traverse components' children | 1010 | // TODO - Don't traverse components' children |
| 1010 | if(elt.elementModel && elt.elementModel.isComponent) | 1011 | // if(elt.elementModel && elt.elementModel.isComponent) |
| 1012 | if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG")))) | ||
| 1011 | { | 1013 | { |
| 1012 | return; | 1014 | return; |
| 1013 | } | 1015 | } |