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/flow.reel | |
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/flow.reel')
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.html | 11 | ||||
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.js | 44 |
2 files changed, 44 insertions, 11 deletions
diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html index b00512cf..4d8cc16b 100644 --- a/node_modules/montage/ui/flow.reel/flow.html +++ b/node_modules/montage/ui/flow.reel/flow.html | |||
@@ -10,7 +10,7 @@ | |||
10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
11 | { | 11 | { |
12 | "repetition": { | 12 | "repetition": { |
13 | "prototype": "montage/ui/repetition.reel", | 13 | "prototype": "ui/repetition.reel", |
14 | "properties": { | 14 | "properties": { |
15 | "element": { | 15 | "element": { |
16 | "#": "montage-flow-repetition" | 16 | "#": "montage-flow-repetition" |
@@ -18,7 +18,7 @@ | |||
18 | } | 18 | } |
19 | }, | 19 | }, |
20 | "translateComposer": { | 20 | "translateComposer": { |
21 | "prototype": "montage/ui/composer/translate-composer", | 21 | "prototype": "ui/composer/translate-composer", |
22 | "properties": { | 22 | "properties": { |
23 | "component": {"@": "owner"}, | 23 | "component": {"@": "owner"}, |
24 | "minTranslateX": 0, | 24 | "minTranslateX": 0, |
@@ -27,12 +27,10 @@ | |||
27 | }, | 27 | }, |
28 | "bindings": { | 28 | "bindings": { |
29 | "element": {"<-": "@owner._element"}, | 29 | "element": {"<-": "@owner._element"}, |
30 | "maxTranslateX": {"<-": "@owner.maxTranslateX"}, | 30 | "maxTranslateX": {"<-": "@owner.maxTranslateX"} |
31 | "translateX": {"->": "@owner.translateX"} | ||
32 | } | 31 | } |
33 | }, | 32 | }, |
34 | "owner": { | 33 | "owner": { |
35 | "prototype": "montage/ui/flow.reel", | ||
36 | "properties": { | 34 | "properties": { |
37 | "element": { | 35 | "element": { |
38 | "#": "montage-flow" | 36 | "#": "montage-flow" |
@@ -48,7 +46,8 @@ | |||
48 | "isSelectionEnabled": { | 46 | "isSelectionEnabled": { |
49 | "boundObject": {"@": "repetition"}, | 47 | "boundObject": {"@": "repetition"}, |
50 | "boundObjectPropertyPath": "isSelectionEnabled" | 48 | "boundObjectPropertyPath": "isSelectionEnabled" |
51 | } | 49 | }, |
50 | "translateX": {"<-": "@translateComposer.translateX"} | ||
52 | } | 51 | } |
53 | } | 52 | } |
54 | } | 53 | } |
diff --git a/node_modules/montage/ui/flow.reel/flow.js b/node_modules/montage/ui/flow.reel/flow.js index 9fa9d8b1..74f05d88 100644 --- a/node_modules/montage/ui/flow.reel/flow.js +++ b/node_modules/montage/ui/flow.reel/flow.js | |||
@@ -10,6 +10,16 @@ var Montage = require("montage").Montage, | |||
10 | 10 | ||
11 | var Flow = exports.Flow = Montage.create(Component, { | 11 | var Flow = exports.Flow = Montage.create(Component, { |
12 | 12 | ||
13 | _repetition: { | ||
14 | serializable: true, | ||
15 | value: null | ||
16 | }, | ||
17 | |||
18 | _translateComposer: { | ||
19 | serializable: true, | ||
20 | value: null | ||
21 | }, | ||
22 | |||
13 | _splinePaths: { | 23 | _splinePaths: { |
14 | enumerable: false, | 24 | enumerable: false, |
15 | value: null | 25 | value: null |
@@ -78,6 +88,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
78 | }, | 88 | }, |
79 | 89 | ||
80 | paths: { // TODO: listen for changes? | 90 | paths: { // TODO: listen for changes? |
91 | serializable: true, | ||
81 | get: function () { | 92 | get: function () { |
82 | return this._paths; | 93 | return this._paths; |
83 | }, | 94 | }, |
@@ -124,6 +135,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
124 | }, | 135 | }, |
125 | 136 | ||
126 | cameraPosition: { | 137 | cameraPosition: { |
138 | serializable: true, | ||
127 | get: function () { | 139 | get: function () { |
128 | return this._cameraPosition; | 140 | return this._cameraPosition; |
129 | }, | 141 | }, |
@@ -135,6 +147,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
135 | }, | 147 | }, |
136 | 148 | ||
137 | cameraTargetPoint: { | 149 | cameraTargetPoint: { |
150 | serializable: true, | ||
138 | get: function () { | 151 | get: function () { |
139 | return this._cameraTargetPoint; | 152 | return this._cameraTargetPoint; |
140 | }, | 153 | }, |
@@ -146,6 +159,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
146 | }, | 159 | }, |
147 | 160 | ||
148 | cameraFov: { | 161 | cameraFov: { |
162 | serializable: true, | ||
149 | get: function () { | 163 | get: function () { |
150 | return this._cameraFov; | 164 | return this._cameraFov; |
151 | }, | 165 | }, |
@@ -157,6 +171,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
157 | }, | 171 | }, |
158 | 172 | ||
159 | cameraRoll: { | 173 | cameraRoll: { |
174 | serializable: true, | ||
160 | get: function () { | 175 | get: function () { |
161 | return this._cameraRoll; | 176 | return this._cameraRoll; |
162 | }, | 177 | }, |
@@ -173,6 +188,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
173 | }, | 188 | }, |
174 | 189 | ||
175 | stride: { | 190 | stride: { |
191 | serializable: true, | ||
176 | get: function () { | 192 | get: function () { |
177 | return this._stride; | 193 | return this._stride; |
178 | }, | 194 | }, |
@@ -195,6 +211,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
195 | }, | 211 | }, |
196 | 212 | ||
197 | scrollingTransitionDuration: { // TODO: think about using the Date Converter | 213 | scrollingTransitionDuration: { // TODO: think about using the Date Converter |
214 | serializable: true, | ||
198 | get: function () { | 215 | get: function () { |
199 | return this._scrollingTransitionDuration; | 216 | return this._scrollingTransitionDuration; |
200 | }, | 217 | }, |
@@ -231,12 +248,12 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
231 | }, | 248 | }, |
232 | 249 | ||
233 | hasSelectedIndexScrolling: { | 250 | hasSelectedIndexScrolling: { |
234 | enumerable: false, | 251 | serializable: true, |
235 | value: false | 252 | value: false |
236 | }, | 253 | }, |
237 | 254 | ||
238 | selectedIndexScrollingOffset: { | 255 | selectedIndexScrollingOffset: { |
239 | enumerable: false, | 256 | serializable: true, |
240 | value: 0 | 257 | value: 0 |
241 | }, | 258 | }, |
242 | 259 | ||
@@ -261,6 +278,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
261 | }, | 278 | }, |
262 | 279 | ||
263 | scrollingTransitionTimingFunction: { | 280 | scrollingTransitionTimingFunction: { |
281 | serializable: true, | ||
264 | get: function () { | 282 | get: function () { |
265 | return this._scrollingTransitionTimingFunction; | 283 | return this._scrollingTransitionTimingFunction; |
266 | }, | 284 | }, |
@@ -387,6 +405,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
387 | }, | 405 | }, |
388 | 406 | ||
389 | elementsBoundingSphereRadius: { | 407 | elementsBoundingSphereRadius: { |
408 | serializable: true, | ||
390 | get: function () { | 409 | get: function () { |
391 | return this._elementsBoundingSphereRadius; | 410 | return this._elementsBoundingSphereRadius; |
392 | }, | 411 | }, |
@@ -875,6 +894,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
875 | }, | 894 | }, |
876 | 895 | ||
877 | selectedIndexes: { | 896 | selectedIndexes: { |
897 | serializable: true, | ||
878 | get: function () { | 898 | get: function () { |
879 | if (this._repetition) { | 899 | if (this._repetition) { |
880 | return this._repetition.selectedIndexes; | 900 | return this._repetition.selectedIndexes; |
@@ -897,6 +917,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
897 | }, | 917 | }, |
898 | 918 | ||
899 | activeIndexes: { | 919 | activeIndexes: { |
920 | serializable: true, | ||
900 | get: function () { | 921 | get: function () { |
901 | if (this._repetition) { | 922 | if (this._repetition) { |
902 | return this._repetition.activeIndexes; | 923 | return this._repetition.activeIndexes; |
@@ -938,6 +959,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
938 | } | 959 | } |
939 | this.length = maxLength; | 960 | this.length = maxLength; |
940 | } | 961 | } |
962 | this.needsDraw = true; | ||
941 | } | 963 | } |
942 | } | 964 | } |
943 | }, | 965 | }, |
@@ -966,6 +988,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
966 | }, | 988 | }, |
967 | 989 | ||