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/examples/feed-reader/main.reel/main.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/examples/feed-reader/main.reel/main.html')
-rw-r--r-- | node_modules/montage/examples/feed-reader/main.reel/main.html | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html index ef4fc92a..50bac601 100644 --- a/node_modules/montage/examples/feed-reader/main.reel/main.html +++ b/node_modules/montage/examples/feed-reader/main.reel/main.html | |||
@@ -44,7 +44,9 @@ | |||
44 | "module": "montage/ui/feed-reader/feed-reader.reel", | 44 | "module": "montage/ui/feed-reader/feed-reader.reel", |
45 | "name": "FeedReader", | 45 | "name": "FeedReader", |
46 | "properties": { | 46 | "properties": { |
47 | "element": {"#": "feed-reader"} | 47 | "element": {"#": "feed-reader"}, |
48 | "feedDisplayMode": "timed", | ||
49 | "interval": "5" | ||
48 | } | 50 | } |
49 | }, | 51 | }, |
50 | 52 | ||
@@ -76,7 +78,14 @@ | |||
76 | "map": { | 78 | "map": { |
77 | "prototype": "montage/ui/map.reel", | 79 | "prototype": "montage/ui/map.reel", |
78 | "properties": { | 80 | "properties": { |
79 | "element": {"#": "map"} | 81 | "element": {"#": "map"}, |
82 | "traffic": false | ||
83 | }, | ||
84 | "bindings": { | ||
85 | "traffic": { | ||
86 | "boundObject": {"@": "traffic"}, | ||
87 | "boundObjectPropertyPath": "checked" | ||
88 | } | ||
80 | } | 89 | } |
81 | }, | 90 | }, |
82 | 91 | ||
@@ -86,6 +95,12 @@ | |||
86 | "element": {"#": "types"} | 95 | "element": {"#": "types"} |
87 | } | 96 | } |
88 | }, | 97 | }, |
98 | "traffic": { | ||
99 | "prototype": "montage/ui/checkbox.reel", | ||
100 | "properties": { | ||
101 | "element": {"#": "traffic"} | ||
102 | } | ||
103 | }, | ||
89 | 104 | ||
90 | "owner": { | 105 | "owner": { |
91 | "module": "main.reel", | 106 | "module": "main.reel", |
@@ -155,6 +170,18 @@ | |||
155 | margin-top: 10px; | 170 | margin-top: 10px; |
156 | } | 171 | } |
157 | 172 | ||
173 | /* | ||
174 | .feed-reader .feed-entry { | ||
175 | visibility:hidden; | ||
176 | opacity:0; | ||
177 | transition:visibility 0s linear 0.5s,opacity 0.5s linear; | ||
178 | } | ||
179 | .feed-reader .feed-entry .active { | ||
180 | visibility:visible; | ||
181 | opacity:1; | ||
182 | transition-delay:0s; | ||
183 | } | ||
184 | */ | ||
158 | 185 | ||
159 | </style> | 186 | </style> |
160 | 187 | ||
@@ -194,6 +221,7 @@ | |||
194 | <option value='gas_station'>Gas Stations</option> | 221 | <option value='gas_station'>Gas Stations</option> |
195 | </select> | 222 | </select> |
196 | </div> | 223 | </div> |
224 | <input type="checkbox" id="traffic">Show Traffic</input> | ||
197 | </form> | 225 | </form> |
198 | </div> | 226 | </div> |
199 | <div id="map">Map</div> | 227 | <div id="map">Map</div> |