diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/resize-composer.js | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/resize-composer.js')
-rw-r--r-- | js/panels/resize-composer.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js index 2278623f..33e42511 100644 --- a/js/panels/resize-composer.js +++ b/js/panels/resize-composer.js | |||
@@ -10,11 +10,13 @@ var Composer = require("montage/ui/composer/composer").Composer; | |||
10 | exports.ResizeComposer = Montage.create(Composer, { | 10 | exports.ResizeComposer = Montage.create(Composer, { |
11 | 11 | ||
12 | xAxis: { | 12 | xAxis: { |
13 | value: true | 13 | value: true, |
14 | serializable: true | ||
14 | }, | 15 | }, |
15 | 16 | ||
16 | yAxis: { | 17 | yAxis: { |
17 | value: true | 18 | value: true, |
19 | serializable: true | ||
18 | }, | 20 | }, |
19 | 21 | ||
20 | enabled : { | 22 | enabled : { |