diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/stage/layout.js | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/stage/layout.js')
| -rwxr-xr-x | js/stage/layout.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index a096848e..0a76dbe5 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
| @@ -174,7 +174,7 @@ exports.Layout = Montage.create(Component, { | |||
| 174 | var tmpMat = viewUtils.getLocalToGlobalMatrix( item ); | 174 | var tmpMat = viewUtils.getLocalToGlobalMatrix( item ); |
| 175 | 175 | ||
| 176 | var zoomFactor = 1; | 176 | var zoomFactor = 1; |
| 177 | if (this.stage._viewport.style && this.stage._viewport.style.zoom) { | 177 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { |
| 178 | zoomFactor = Number(this.stage._viewport.style.zoom); | 178 | zoomFactor = Number(this.stage._viewport.style.zoom); |
| 179 | } | 179 | } |
| 180 | 180 | ||