diff options
author | Valerio Virgillito | 2012-02-02 00:11:51 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-02 15:33:42 -0800 |
commit | a3024011a91d3941f81481dd4d600e9684eb0fd4 (patch) | |
tree | 084b4856910f1db53973dd11617f7ffa03a6dd46 /node_modules/montage/ui/list.reel | |
parent | 97255032921178bdfbc25512ddf3e0867e353f7a (diff) | |
download | ninja-a3024011a91d3941f81481dd4d600e9684eb0fd4.tar.gz |
upgrading to Montage v0.6
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/list.reel')
-rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 34 | ||||
-rwxr-xr-x | node_modules/montage/ui/list.reel/list.js | 192 |
2 files changed, 39 insertions, 187 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html index 2428bded..98629f04 100755 --- a/node_modules/montage/ui/list.reel/list.html +++ b/node_modules/montage/ui/list.reel/list.html | |||
@@ -16,6 +16,28 @@ | |||
16 | "element": { | 16 | "element": { |
17 | "#": "repetition" | 17 | "#": "repetition" |
18 | } | 18 | } |
19 | }, | ||
20 | "bindings": { | ||
21 | "content": { | ||
22 | "boundObject": {"@": "owner"}, | ||
23 | "boundObjectPropertyPath": "originalContent", | ||
24 | "oneway": true | ||
25 | }, | ||
26 | "objects": { | ||
27 | "boundObject": {"@": "owner"}, | ||
28 | "boundObjectPropertyPath": "objects", | ||
29 | "oneway": true | ||
30 | }, | ||
31 | "contentController": { | ||
32 | "boundObject": {"@": "owner"}, | ||
33 | "boundObjectPropertyPath": "contentController", | ||
34 | "oneway": true | ||
35 | }, | ||
36 | "isSelectionEnabled": { | ||
37 | "boundObject": {"@": "owner"}, | ||
38 | "boundObjectPropertyPath": "isSelectionEnabled", | ||
39 | "oneway": true | ||
40 | } | ||
19 | } | 41 | } |
20 | }, | 42 | }, |
21 | "scrollview1": { | 43 | "scrollview1": { |
@@ -25,6 +47,13 @@ | |||
25 | "element": { | 47 | "element": { |
26 | "#": "scrollView" | 48 | "#": "scrollView" |
27 | } | 49 | } |
50 | }, | ||
51 | "bindings": { | ||
52 | "axis": { | ||
53 | "boundObject": {"@": "owner"}, | ||
54 | "boundObjectPropertyPath": "axis", | ||
55 | "oneway": true | ||
56 | } | ||
28 | } | 57 | } |
29 | }, | 58 | }, |
30 | "owner": { | 59 | "owner": { |
@@ -36,9 +65,6 @@ | |||
36 | }, | 65 | }, |
37 | "_repetition": { | 66 | "_repetition": { |
38 | "@": "repetition1" | 67 | "@": "repetition1" |
39 | }, | ||
40 | "_scrollview": { | ||
41 | "@": "scrollview1" | ||
42 | } | 68 | } |
43 | } | 69 | } |
44 | } | 70 | } |
@@ -49,7 +75,7 @@ | |||
49 | <body> | 75 | <body> |
50 | <div id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> | 76 | <div id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> |
51 | <div id="scrollView" class="montage-list-scrollView"> | 77 | <div id="scrollView" class="montage-list-scrollView"> |
52 | <div id="repetition"></div> | 78 | <div data-montage-id="repetition"></div> |
53 | </div> | 79 | </div> |
54 | </div> | 80 | </div> |
55 | </body> | 81 | </body> |
diff --git a/node_modules/montage/ui/list.reel/list.js b/node_modules/montage/ui/list.reel/list.js index 2af99bf4..02c91093 100755 --- a/node_modules/montage/ui/list.reel/list.js +++ b/node_modules/montage/ui/list.reel/list.js | |||
@@ -23,23 +23,7 @@ var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui | |||
23 | enumerable: false, | 23 | enumerable: false, |
24 | value: null | 24 | value: null |
25 | }, | 25 | }, |
26 | /** | 26 | /** |
27 | Description TODO | ||
28 | @private | ||
29 | */ | ||
30 | _scrollview: { | ||
31 | enumerable: false, | ||
32 | value: null | ||
33 | }, | ||
34 | /** | ||
35 | Description TODO | ||
36 | @private | ||
37 | */ | ||
38 | _orphanedChildren: { | ||
39 | enumerable: false, | ||
40 | value: null | ||
41 | }, | ||
42 | /** | ||
43 | Description TODO | 27 | Description TODO |
44 | @type {Property} | 28 | @type {Property} |
45 | @default null | 29 | @default null |
@@ -48,131 +32,25 @@ var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui | |||
48 | enumerable: false, | 32 | enumerable: false, |
49 | value: null | 33 | value: null |
50 | }, | 34 | }, |
51 | 35 | ||
52 | //TODO make some convenient forwarding property or something, this is a little tedious | 36 | objects: { |
53 | |||
54 | // Properties to forward to the scrollview | ||
55 | /** | ||
56 | Description TODO | ||
57 | @private | ||
58 | */ | ||
59 | _axisForScrollview: { | ||
60 | enumerable: false, | ||
61 | value: null | 37 | value: null |
62 | }, | 38 | }, |
63 | /** | 39 | |
64 | Description TODO | 40 | contentController: { |
65 | @type {Function} | ||
66 | @default null | ||
67 | */ | ||
68 | axis: { | ||
69 | enumerable: false, | ||
70 | get: function() { | ||
71 | if (this._scrollview) { | ||
72 | return this._scrollview.axis; | ||
73 | } else { | ||
74 | return this._axisForScrollview; | ||
75 | } | ||
76 | }, | ||
77 | set: function(value) { | ||
78 | if (this._scrollview) { | ||
79 | this._scrollview.axis = value; | ||
80 | } else { | ||
81 | this._axisForScrollview = value; | ||
82 | } | ||
83 | } | ||
84 | }, | ||
85 | |||
86 | //Properties to forward to the repetition | ||
87 | /** | ||
88 | Description TODO | ||
89 | @private | ||
90 | */ | ||
91 | _objectsForRepetition: { | ||
92 | enumerable: false, | ||
93 | value: null | 41 | value: null |
94 | }, | 42 | }, |
95 | /** | 43 | |
96 | Description TODO | 44 | axis: { |
97 | @type {Function} | ||
98 | @default null | ||
99 | */ | ||
100 | objects: { | ||
101 | enumerable: false, | ||
102 | get: function() { | ||
103 | if (this._repetition) { | ||
104 | return this._repetition.objects; | ||
105 | } else { | ||
106 | return this._objectsForRepetition; | ||
107 | } | ||
108 | }, | ||
109 | set: function(value) { | ||
110 | if (this._repetition) { | ||
111 | this._repetition.objects = value; | ||
112 | } else { | ||
113 | this._objectsForRepetition = value; | ||
114 | } | ||
115 | } | ||
116 | }, | ||
117 | /** | ||
118 | Description TODO | ||
119 | @private | ||
120 | */ | ||
121 | _contentControllerForRepetition: { | ||
122 | enumerable: false, | ||
123 | value: null | 45 | value: null |
124 | }, | 46 | }, |
125 | /** | 47 | |
126 | Description TODO | ||
127 | @type {Function} | ||
128 | @default null | ||
129 | */ | ||
130 | contentController: { | ||
131 | enumerable: false, | ||
132 | get: function() { | ||
133 | if (this._repetition) { | ||
134 | return this._repetition.contentController; | ||
135 | } else { | ||
136 | return this._contentControllerForRepetition; | ||
137 | } | ||
138 | }, | ||
139 | set: function(value) { | ||
140 | if (this._repetition) { | ||
141 | this._repetition.contentController = value; | ||
142 | } else { | ||
143 | this._contentControllerForRepetition = value; | ||
144 | } | ||
145 | } | ||
146 | }, | ||
147 | /** | 48 | /** |
148 | Description TODO | 49 | Description TODO |
149 | @private | 50 | @private |
150 | */ | 51 | */ |
151 | _isSelectionEnabledForRepetition: { | ||
152 | enumerable: false, | ||
153 | value: null | ||
154 | }, | ||
155 | /** | ||
156 | Description TODO | ||
157 | @type {Function} | ||
158 | @default null | ||
159 | */ | ||
160 | isSelectionEnabled: { | 52 | isSelectionEnabled: { |
161 | enumerable: false, | 53 | value: null |