diff options
| author | Valerio Virgillito | 2012-05-03 10:58:03 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-03 10:58:03 -0700 |
| commit | be1806505f4af86c3b5c15454e67cb8cec696554 (patch) | |
| tree | 137be320b75d29c295b332d381bd1851241887a6 /js/stage/layout.js | |
| parent | 30bf02869c93072cdb3a3a8b50cf943917f3b026 (diff) | |
| parent | 691beb1c39fc0baa683f1fc56cbc519fe58f306d (diff) | |
| download | ninja-be1806505f4af86c3b5c15454e67cb8cec696554.tar.gz | |
Merge branch 'refs/heads/master' into data-id
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 | ||