aboutsummaryrefslogtreecommitdiff
path: root/js/panels/resize-composer.js
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/resize-composer.js
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 : {