aboutsummaryrefslogtreecommitdiff
path: root/js/panels/resize-composer.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 00:45:26 -0700
committerArmen Kesablyan2012-06-19 00:45:26 -0700
commitc59eb371559a3061ce53223e249ca97daace5968 (patch)
treef9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/resize-composer.js
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/resize-composer.js')
-rw-r--r--js/panels/resize-composer.js6
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;
10exports.ResizeComposer = Montage.create(Composer, { 10exports.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 : {