diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /node_modules/montage/ui/composer/composer.js | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'node_modules/montage/ui/composer/composer.js')
-rw-r--r-- | node_modules/montage/ui/composer/composer.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/node_modules/montage/ui/composer/composer.js b/node_modules/montage/ui/composer/composer.js index 7c30b259..ccbf8dbb 100644 --- a/node_modules/montage/ui/composer/composer.js +++ b/node_modules/montage/ui/composer/composer.js | |||
@@ -30,7 +30,8 @@ exports.Composer = Montage.create(Montage, /** @lends module:montage/ui/composer | |||
30 | }, | 30 | }, |
31 | set: function(component) { | 31 | set: function(component) { |
32 | this._component = component; | 32 | this._component = component; |
33 | } | 33 | }, |
34 | serializable: true | ||
34 | }, | 35 | }, |
35 | 36 | ||
36 | _element: { | 37 | _element: { |
@@ -48,7 +49,8 @@ exports.Composer = Montage.create(Montage, /** @lends module:montage/ui/composer | |||
48 | }, | 49 | }, |
49 | set: function(element) { | 50 | set: function(element) { |
50 | this._element = element; | 51 | this._element = element; |
51 | } | 52 | }, |
53 | serializable: true | ||
52 | }, | 54 | }, |
53 | 55 | ||
54 | 56 | ||
@@ -61,7 +63,8 @@ exports.Composer = Montage.create(Montage, /** @lends module:montage/ui/composer | |||
61 | * @default false | 63 | * @default false |
62 | */ | 64 | */ |
63 | lazyLoad: { | 65 | lazyLoad: { |
64 | value: false | 66 | value: false, |
67 | serializable: true | ||
65 | }, | 68 | }, |
66 | 69 | ||
67 | _needsFrame: { | 70 | _needsFrame: { |