diff options
author | Kishore Subramanian | 2012-03-19 14:14:29 -0700 |
---|---|---|
committer | Kishore Subramanian | 2012-03-19 14:14:29 -0700 |
commit | ec58642a7b31165890eb5bef7d95ce59dd0c34a0 (patch) | |
tree | 32640021d0362314ee5898626a0721feca814154 /node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html | |
parent | 9d364be255900e9bde02c4b254d145ec41fc78fb (diff) | |
download | ninja-ec58642a7b31165890eb5bef7d95ce59dd0c34a0.tar.gz |
Changes to Map and FeedReader
- Added traffic property to Map
- Support for show/hide traffic in the example
- Changed FeedReader to use only one DIV. No longer uses Repetition
- Support multiple modes in the Feed reader - timed/animated
Diffstat (limited to 'node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html')
-rw-r--r-- | node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html index 646fd01e..e5251e0a 100644 --- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html | |||
@@ -23,17 +23,7 @@ | |||
23 | } | 23 | } |
24 | } | 24 | } |
25 | }, | 25 | }, |
26 | 26 | ||
27 | "repetition": { | ||
28 | "module": "montage/ui/repetition.reel", | ||
29 | "name": "Repetition", | ||
30 | "properties": { | ||
31 | "element": {"#": "entries"}, | ||
32 | "contentController": {"@": "entriesController"}, | ||
33 | "isSelectionEnabled": true, | ||
34 | "orientation": "vertical" | ||
35 | } | ||
36 | }, | ||
37 | "feedEntry": { | 27 | "feedEntry": { |
38 | "module": "montage/ui/feed-reader/feed-entry.reel", | 28 | "module": "montage/ui/feed-reader/feed-entry.reel", |
39 | "name": "FeedEntry", | 29 | "name": "FeedEntry", |
@@ -42,27 +32,19 @@ | |||
42 | }, | 32 | }, |
43 | "bindings": { | 33 | "bindings": { |
44 | "entry": { | 34 | "entry": { |
45 | "boundObject": {"@": "repetition"}, | 35 | "boundObject": {"@": "owner"}, |
46 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 36 | "boundObjectPropertyPath": "activeFeedEntry", |
47 | "oneway": true | 37 | "oneway": true |
48 | } | 38 | } |
49 | } | 39 | } |
50 | }, | 40 | }, |
51 | 41 | ||
52 | "owner": { | 42 | "owner": { |
53 | "module": "montage/ui/feed-reader/feed-reader.reel", | 43 | "module": "montage/ui/feed-reader/feed-reader.reel", |
54 | "name": "FeedReader", | 44 | "name": "FeedReader", |
55 | "properties": { | 45 | "properties": { |
56 | "element": {"#": "feed-reader"}, | 46 | "element": {"#": "feed-reader"} |
57 | "repetition": {"@": "repetition"} | 47 | } |
58 | }, | ||
59 | "bindings": { | ||
60 | "items": { | ||
61 | "boundObject": {"@": "repetition"}, | ||
62 | "boundObjectPropertyPath": "objects", | ||
63 | "oneway": true | ||
64 | } | ||
65 | } | ||
66 | } | 48 | } |
67 | 49 | ||
68 | } | 50 | } |
@@ -74,16 +56,8 @@ | |||
74 | } | 56 | } |
75 | 57 | ||
76 | .feed-entry { | 58 | .feed-entry { |
77 | display: none; | ||
78 | } | ||
79 | |||
80 | .montage-hidden { | ||
81 | display: none; | ||
82 | } | 59 | } |
83 | 60 | ||
84 | .active { | ||
85 | display: block; | ||
86 | } | ||
87 | 61 | ||
88 | </style> | 62 | </style> |
89 | 63 | ||