diff options
author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/list.reel/list.html | |
parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/list.reel/list.html')
-rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 34 |
1 files changed, 30 insertions, 4 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> |