aboutsummaryrefslogtreecommitdiff
path: root/js/panels/resize-composer.js
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/resize-composer.js
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
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 : {