diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/tools/PanTool.js | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools/PanTool.js')
| -rwxr-xr-x | js/tools/PanTool.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js index 39f89d17..a8911c0c 100755 --- a/js/tools/PanTool.js +++ b/js/tools/PanTool.js | |||
| @@ -122,7 +122,6 @@ exports.PanTool = Montage.create(toolBase, | |||
| 122 | value: function () | 122 | value: function () |
| 123 | { | 123 | { |
| 124 | var uc = this.application.ninja.currentDocument.model.documentRoot; | 124 | var uc = this.application.ninja.currentDocument.model.documentRoot; |
| 125 | //var uc = documentManagerModule.DocumentManager.activeDocument | ||
| 126 | var ucMat = viewUtils.getMatrixFromElement(uc); | 125 | var ucMat = viewUtils.getMatrixFromElement(uc); |
| 127 | 126 | ||
| 128 | var noTrans = ucMat.slice(); | 127 | var noTrans = ucMat.slice(); |