diff options
| author | hwc487 | 2012-06-13 14:04:09 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-13 14:04:09 -0700 |
| commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
| tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/controllers/elements | |
| parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/controllers/elements')
| -rwxr-xr-x | js/controllers/elements/body-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 0dc11b82..27989c65 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
| @@ -37,7 +37,7 @@ exports.BodyController = Montage.create(ElementController, { | |||
| 37 | case "height": | 37 | case "height": |
| 38 | case "width": | 38 | case "width": |
| 39 | case "-webkit-transform-style": | 39 | case "-webkit-transform-style": |
| 40 | return this.application.ninja.stylesController.getElementStyle(el, p, true, true); | 40 | return this.application.ninja.stylesController.getElementStyle(el, p); |
| 41 | default: | 41 | default: |
| 42 | return ElementController.getProperty(el, p, true, true); | 42 | return ElementController.getProperty(el, p, true, true); |
| 43 | //console.log("Undefined Stage property ", p); | 43 | //console.log("Undefined Stage property ", p); |