diff options
| author | Jose Antonio Marquez | 2012-02-29 15:15:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-29 15:15:51 -0800 |
| commit | b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (patch) | |
| tree | 5978eb8742df65de0e0b98454bfc04c2b4cac6e7 /js/helper-classes/3D/view-utils.js | |
| parent | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/helper-classes/3D/view-utils.js')
| -rwxr-xr-x | js/helper-classes/3D/view-utils.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index bedda8bf..c1f59397 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
| @@ -580,7 +580,8 @@ exports.ViewUtils = Montage.create(Component, { | |||
| 580 | if (elt.style.height) h = MathUtils.styleToNumber(elt.style.height); | 580 | if (elt.style.height) h = MathUtils.styleToNumber(elt.style.height); |
| 581 | } | 581 | } |
| 582 | 582 | ||
| 583 | if (elt instanceof SVGSVGElement) { | 583 | // if (elt instanceof SVGSVGElement) { |
| 584 | if(elt.nodeName.toLowerCase() === "svg") { | ||
| 584 | if(w instanceof SVGAnimatedLength) | 585 | if(w instanceof SVGAnimatedLength) |
| 585 | w = w.animVal.value; | 586 | w = w.animVal.value; |
| 586 | if(h instanceof SVGAnimatedLength) | 587 | if(h instanceof SVGAnimatedLength) |