diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/stage/layout.js | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
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 | ||