diff options
author | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
commit | 2bae1b3148233288ec0bc50876935bdfea1f288c (patch) | |
tree | 686fa3b5b9615941bb7013f35c91e8f326b049db /node_modules | |
parent | 2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'node_modules')
21 files changed, 50 insertions, 26 deletions
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json index e80fa510..4a3da3c6 100644 --- a/node_modules/components-data/map.json +++ b/node_modules/components-data/map.json | |||
@@ -10,7 +10,7 @@ | |||
10 | "name": "category", | 10 | "name": "category", |
11 | "type": "select", | 11 | "type": "select", |
12 | "default": "restaurant", | 12 | "default": "restaurant", |
13 | "possibleValues": ["restaurant", "hospital", "cafe", "museum"] | 13 | "possibleValues": ["", "restaurant", "hospital", "cafe", "museum"] |
14 | }, | 14 | }, |
15 | { | 15 | { |
16 | "name": "center", | 16 | "name": "center", |
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index b6868954..9a2177c6 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
@@ -82,7 +82,11 @@ | |||
82 | {"name": "feed-reader.reel"} | 82 | {"name": "feed-reader.reel"} |
83 | ] | 83 | ] |
84 | }, | 84 | }, |
85 | {"name": "map.reel"}, | 85 | {"name": "map.reel", |
86 | "children": [ | ||
87 | {"name": "icons"} | ||
88 | ] | ||
89 | }, | ||
86 | {"name": "picasa-carousel.reel", | 90 | {"name": "picasa-carousel.reel", |
87 | "children": [ | 91 | "children": [ |
88 | {"name": "image.reel"} | 92 | {"name": "image.reel"} |
@@ -370,6 +374,10 @@ | |||
370 | "montage-google/map.reel/map.js", | 374 | "montage-google/map.reel/map.js", |
371 | "montage-google/map.reel/map.html", | 375 | "montage-google/map.reel/map.html", |
372 | "montage-google/map.reel/map.css", | 376 | "montage-google/map.reel/map.css", |
377 | "montage-google/map.reel/icons/fork-and-knife.png", | ||
378 | "montage-google/map.reel/icons/medical.png", | ||
379 | "montage-google/map.reel/icons/picture-frame.png", | ||
380 | "montage-google/map.reel/icons/cafe.png", | ||
373 | "montage-google/picasa-carousel.reel/image.reel/image.html", | 381 | "montage-google/picasa-carousel.reel/image.reel/image.html", |
374 | "montage-google/picasa-carousel.reel/image.reel/image.js", | 382 | "montage-google/picasa-carousel.reel/image.reel/image.js", |
375 | "montage-google/picasa-carousel.reel/picasa-carousel.css", | 383 | "montage-google/picasa-carousel.reel/picasa-carousel.css", |
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 332b2932..66471eab 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |||
@@ -45,7 +45,6 @@ | |||
45 | } | 45 | } |
46 | }, | 46 | }, |
47 | "owner": { | 47 | "owner": { |
48 | "prototype": "feed-reader/feed-entry.reel", | ||
49 | "properties": { | 48 | "properties": { |
50 | "element": {"#": "feed-entry"} | 49 | "element": {"#": "feed-entry"} |
51 | } | 50 | } |
@@ -76,6 +75,7 @@ | |||
76 | </head> | 75 | </head> |
77 | <body> | 76 | <body> |
78 | <div class="feed-entry" data-montage-id="feed-entry"> | 77 | <div class="feed-entry" data-montage-id="feed-entry"> |
78 | |||
79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> |
80 | <p data-montage-id="entry-description" class="entry-description"></p> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
81 | </div> | 81 | </div> |
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html index 4d6792a1..a5c1346f 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |||
@@ -38,7 +38,6 @@ | |||
38 | }, | 38 | }, |
39 | 39 | ||
40 | "owner": { | 40 | "owner": { |
41 | "prototype": "feed-reader/feed-reader.reel", | ||
42 | "properties": { | 41 | "properties": { |
43 | "element": {"#": "feed-reader"} | 42 | "element": {"#": "feed-reader"} |
44 | } | 43 | } |
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js index 34533d6d..3c139c60 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js | |||
@@ -16,11 +16,8 @@ exports.FeedReader = Montage.create(Component, { | |||
16 | value: function() { | 16 | value: function() { |
17 | var self = this; | 17 | var self = this; |
18 | var apiInit = function() { | 18 | var apiInit = function() { |
19 | console.log('google api initialized'); | ||
20 | |||
21 | google.load("feeds", "1", { | 19 | google.load("feeds", "1", { |
22 | callback: function() { | 20 | callback: function() { |
23 | console.log('google feeds api loaded'); | ||
24 | self._apiLoaded = true; | 21 | self._apiLoaded = true; |
25 | self.feedURL = self._feedURL; | 22 | self.feedURL = self._feedURL; |
26 | self.needsDraw = true; | 23 | self.needsDraw = true; |
diff --git a/node_modules/montage-google/map.reel/icons/airplane.png b/node_modules/montage-google/map.reel/icons/airplane.png new file mode 100644 index 00000000..dfcbbc78 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/airplane.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/cafe.png b/node_modules/montage-google/map.reel/icons/cafe.png new file mode 100644 index 00000000..4e9c517a --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/cafe.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/coffee.png b/node_modules/montage-google/map.reel/icons/coffee.png new file mode 100644 index 00000000..4c4bedad --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/coffee.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/food.png b/node_modules/montage-google/map.reel/icons/food.png new file mode 100644 index 00000000..81afd74a --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/food.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/fork-and-knife.png b/node_modules/montage-google/map.reel/icons/fork-and-knife.png new file mode 100644 index 00000000..06d91088 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/fork-and-knife.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/map-marker.png b/node_modules/montage-google/map.reel/icons/map-marker.png new file mode 100644 index 00000000..a5d99d69 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/map-marker.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/medical.png b/node_modules/montage-google/map.reel/icons/medical.png new file mode 100644 index 00000000..ab78c783 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/medical.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/picture-frame.png b/node_modules/montage-google/map.reel/icons/picture-frame.png new file mode 100644 index 00000000..6deee997 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/picture-frame.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/shopping.png b/node_modules/montage-google/map.reel/icons/shopping.png new file mode 100644 index 00000000..03689f99 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/shopping.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/widescreen.png b/node_modules/montage-google/map.reel/icons/widescreen.png new file mode 100644 index 00000000..2e5f1ba7 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/widescreen.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/wine-bottle.png b/node_modules/montage-google/map.reel/icons/wine-bottle.png new file mode 100644 index 00000000..a7df9e97 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/wine-bottle.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/wine-glass.png b/node_modules/montage-google/map.reel/icons/wine-glass.png new file mode 100644 index 00000000..b4d34474 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/wine-glass.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js index 4e3a6d70..1aeb97df 100644 --- a/node_modules/montage-google/map.reel/map.js +++ b/node_modules/montage-google/map.reel/map.js | |||
@@ -117,9 +117,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ | |||
117 | this._category = value; | 117 | this._category = value; |
118 | if (this._map && this.latLng) { | 118 | if (this._map && this.latLng) { |
119 | this._getPlaces(this._category); | 119 | this._getPlaces(this._category); |
120 | this.needsDraw = true; | ||
121 | } | 120 | } |
121 | } else { | ||
122 | this._places = []; | ||
122 | } | 123 | } |
124 | |||
125 | this.needsDraw = true; | ||
123 | } | 126 | } |
124 | }, | 127 | }, |
125 | 128 | ||
@@ -186,26 +189,30 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ | |||
186 | var icon, image; | 189 | var icon, image; |
187 | switch(this.category) { | 190 | switch(this.category) { |
188 | case 'restaurant': | 191 | case 'restaurant': |
189 | icon = '48-fork-and-knife.png'; | 192 | icon = 'fork-and-knife.png'; |
190 | break; | 193 | break; |
191 | case 'hospital': | 194 | case 'hospital': |
192 | icon = '10-medical.png'; | 195 | icon = 'medical.png'; |
193 | break; | 196 | break; |
194 | case 'bar': | 197 | case 'bar': |
195 | icon = '88-beer-mug.png'; | 198 | icon = 'beer-mug.png'; |
196 | break; | 199 | break; |
197 | case 'grocery_or_supermarket': | 200 | case 'grocery_or_supermarket': |
198 | icon = '80-shopping-cart.png'; | 201 | icon = 'shopping.png'; |
199 | break; | 202 | break; |
200 | case 'museum': | 203 | case 'museum': |
201 | icon = '41-picture-frame.png'; | 204 | icon = 'picture-frame.png'; |
202 | break; | 205 | break; |
203 | case 'gas_station': | 206 | case 'gas_station': |
204 | icon = '47-fuel.png'; | 207 | icon = 'fuel.png'; |
205 | break; | 208 | break; |
206 | }; | 209 | case 'cafe': |
210 | icon = 'cafe.png'; | ||
211 | break; | ||
212 | } | ||
213 | |||
207 | if(icon) { |