diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/controllers/elements | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
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); |