aboutsummaryrefslogtreecommitdiff
path: root/js/tools/modifier-tool-base.js
diff options
context:
space:
mode:
authorJon Reid2012-03-06 14:15:18 -0800
committerJon Reid2012-03-06 14:15:18 -0800
commit78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3 (patch)
treec395b703f21431dcb4432c725f4c860431add61b /js/tools/modifier-tool-base.js
parentfa8b81d4f436c0b8564c8dcdd22d8dd6d5bccfaa (diff)
parent60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff)
downloadninja-78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3.tar.gz
Merge branch 'Timeline-uber' into timeline-serialized
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-xjs/tools/modifier-tool-base.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 7d946cb0..7892d015 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -133,6 +133,13 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
133 // a snap on the mouse down 133 // a snap on the mouse down
134 var hitRec = snapManager.snap(point.x, point.y, do3DSnap); 134 var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
135 135
136 // TODO - Check that hitRec's element matches element that browser says we clicked on
137 var elt = this.application.ninja.stage.GetElement(event);
138 if(elt !== hitRec.getElement())
139 {
140 hitRec = snapManager.findHitRecordForElement(elt);
141 }
142
136 // we don't want to snap to selected objects during the drag 143 // we don't want to snap to selected objects during the drag
137 var len = this._targets.length; 144 var len = this._targets.length;
138 for(var i=0; i<len; i++) 145 for(var i=0; i<len; i++)