diff options
| author | Valerio Virgillito | 2012-06-13 13:56:56 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-13 13:56:56 -0700 |
| commit | 682f4917d6badd105998c3dd84d031c38b51f017 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/controllers | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| parent | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (diff) | |
| download | ninja-682f4917d6badd105998c3dd84d031c38b51f017.tar.gz | |
Merge pull request #297 from mqg734/PI_HotTextFixes
Fixing properties panel to support px and % for body and other elements.
Diffstat (limited to 'js/controllers')
| -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); |