diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/stage/layout.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/stage/layout.js')
-rwxr-xr-x | js/stage/layout.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index 1831f4e7..28484b71 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
@@ -17,7 +17,16 @@ var Montage = require("montage/core/core").Montage, | |||
17 | 17 | ||
18 | exports.Layout = Montage.create(Component, { | 18 | exports.Layout = Montage.create(Component, { |
19 | 19 | ||
20 | canvas: { value: null }, | 20 | canvas: { |
21 | value: null, | ||
22 | serializable: true | ||
23 | }, | ||
24 | |||
25 | stage: { | ||
26 | value: null, | ||
27 | serializable: true | ||
28 | }, | ||
29 | |||
21 | ctx: { value: null }, | 30 | ctx: { value: null }, |
22 | 31 | ||
23 | drawFillColor: { value: 'rgba(255,255,255,1)' }, | 32 | drawFillColor: { value: 'rgba(255,255,255,1)' }, |