diff options
| author | hwc487 | 2012-05-01 11:03:56 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-01 11:03:56 -0700 |
| commit | f6983a69649b1c274ce6fe2d278a325994d092b6 (patch) | |
| tree | a360297930c35f3097af16e9f6714ec501bd5894 /js/stage/layout.js | |
| parent | 80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff) | |
| parent | fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff) | |
| download | ninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 | ||