diff options
author | hwc487 | 2012-06-12 15:52:35 -0700 |
---|---|---|
committer | hwc487 | 2012-06-12 15:52:35 -0700 |
commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
tree | f44449a2e0055e21960a5513fb3a0738a91db528 /js/tools/TranslateObject3DTool.js | |
parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
Diffstat (limited to 'js/tools/TranslateObject3DTool.js')
-rwxr-xr-x | js/tools/TranslateObject3DTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js index f8b32d23..d9e558a4 100755 --- a/js/tools/TranslateObject3DTool.js +++ b/js/tools/TranslateObject3DTool.js | |||
@@ -89,7 +89,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | |||
89 | var otherSnap = snapManager.findHitRecordForElement(elt); | 89 | var otherSnap = snapManager.findHitRecordForElement(elt); |
90 | if (otherSnap) hitRec = otherSnap; | 90 | if (otherSnap) hitRec = otherSnap; |
91 | } | 91 | } |
92 | if(elt === this.application.ninja.currentSelectedContainer) | 92 | if(elt === this.application.ninja.currentDocument.model.domContainer) |
93 | { | 93 | { |
94 | this._clickedOnStage = true; | 94 | this._clickedOnStage = true; |
95 | } | 95 | } |