diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /node_modules/montage/ui/list.reel/list.js | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules/montage/ui/list.reel/list.js')
-rwxr-xr-x | node_modules/montage/ui/list.reel/list.js | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/node_modules/montage/ui/list.reel/list.js b/node_modules/montage/ui/list.reel/list.js index 02c91093..63ff09a2 100755 --- a/node_modules/montage/ui/list.reel/list.js +++ b/node_modules/montage/ui/list.reel/list.js | |||
@@ -15,13 +15,13 @@ var Montage = require("montage").Montage, | |||
15 | @extends module:montage/ui/component.Component | 15 | @extends module:montage/ui/component.Component |
16 | */ | 16 | */ |
17 | var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui/list.reel".List# */ { | 17 | var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui/list.reel".List# */ { |
18 | /** | 18 | /** |
19 | Description TODO | 19 | Description TODO |
20 | @private | 20 | @private |
21 | */ | 21 | */ |
22 | _repetition: { | 22 | _repetition: { |
23 | enumerable: false, | 23 | value: null, |
24 | value: null | 24 | serializable: true |
25 | }, | 25 | }, |
26 | /** | 26 | /** |
27 | Description TODO | 27 | Description TODO |
@@ -29,19 +29,22 @@ var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui | |||
29 | @default null | 29 | @default null |
30 | */ | 30 | */ |
31 | delegate: { | 31 | delegate: { |
32 | enumerable: false, | 32 | serializable: true, |
33 | value: null | 33 | value: null |
34 | }, | 34 | }, |
35 | 35 | ||
36 | objects: { | 36 | objects: { |
37 | serializable: true, | ||
37 | value: null | 38 | value: null |
38 | }, | 39 | }, |
39 | 40 | ||
40 | contentController: { | 41 | contentController: { |
42 | serializable: true, | ||
41 | value: null | 43 | value: null |
42 | }, | 44 | }, |
43 | 45 | ||
44 | axis: { | 46 | axis: { |
47 | serializable: true, | ||
45 | value: null | 48 | value: null |
46 | }, | 49 | }, |
47 | 50 | ||
@@ -50,6 +53,7 @@ var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui | |||
50 | @private | 53 | @private |
51 | */ | 54 | */ |
52 | isSelectionEnabled: { | 55 | isSelectionEnabled: { |
56 | serializable: true, | ||
53 | value: null | 57 | value: null |
54 | }, | 58 | }, |
55 | 59 | ||