Merge branch 'refs/heads/Ninja-Internal' into Document

author: Jose Antonio Marquez 2012-06-28 09:50:28 -0700
committer: Jose Antonio Marquez 2012-06-28 09:50:28 -0700
commit: ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch)
tree: a9d5ff91681aa06bf26cb62994461a58d3f80005 /node_modules
parent: ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff)
parent: 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
download: ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz
21 files changed, 34 insertions, 23 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 @@
            "name": "category",
            "type": "select",
            "default": "restaurant",
-            "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
+            "possibleValues": ["", "restaurant", "hospital", "cafe", "museum"]
        },
        {
            "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 @@
                        {"name": "feed-reader.reel"}
                    ]
                },
-                {"name": "map.reel"},
+                {"name": "map.reel",
+                    "children": [
+                        {"name": "icons"}
+                    ]
+                },
                {"name": "picasa-carousel.reel",
                    "children": [
                        {"name": "image.reel"}
@@ -370,6 +374,10 @@
        "montage-google/map.reel/map.js",
        "montage-google/map.reel/map.html",
        "montage-google/map.reel/map.css",
+        "montage-google/map.reel/icons/fork-and-knife.png",
+        "montage-google/map.reel/icons/medical.png",
+        "montage-google/map.reel/icons/picture-frame.png",
+        "montage-google/map.reel/icons/cafe.png",
        "montage-google/picasa-carousel.reel/image.reel/image.html",
        "montage-google/picasa-carousel.reel/image.reel/image.js",
        "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 @@
        }
    },
    "owner": {
-        "prototype": "feed-reader/feed-entry.reel",
        "properties": {
            "element": {"#": "feed-entry"}
        }
@@ -76,6 +75,7 @@
 </head>
 <body>
    <div class="feed-entry" data-montage-id="feed-entry">
        <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a>
        <p data-montage-id="entry-description" class="entry-description"></p>
    </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 @@
    },
    "owner": {
-        "prototype": "feed-reader/feed-reader.reel",
        "properties": {
            "element": {"#": "feed-reader"}
        }
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, {
        value: function() {
            var self = this;
            var apiInit = function() {
-                console.log('google api initialized');
                google.load("feeds", "1", {
                    callback: function() {
-                        console.log('google feeds api loaded');
                        self._apiLoaded = true;
                        self.feedURL = self._feedURL;
                        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/
                this._category = value;
                if (this._map && this.latLng) {
                    this._getPlaces(this._category);
-                    this.needsDraw = true;
                }
+            } else {
+                this._places = [];
            }
+            this.needsDraw = true;
        }
    },
@@ -186,26 +189,30 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
            var icon, image;
            switch(this.category) {
                case 'restaurant':
-                icon = '48-fork-and-knife.png';
+                icon = 'fork-and-knife.png';
                break;
                case 'hospital':
-                icon = '10-medical.png';
+                icon = 'medical.png';
                break;
                case 'bar':
-                icon = '88-beer-mug.png';
+                icon = 'beer-mug.png';
                break;
                case 'grocery_or_supermarket':
-                icon = '80-shopping-cart.png';
+                icon = 'shopping.png';
                break;
                case 'museum':
-                icon = '41-picture-frame.png';
+                icon = 'picture-frame.png';
                break;
                case 'gas_station':
-                icon = '47-fuel.png';
+                icon = 'fuel.png';
                break;
-            };
+                case 'cafe':
+                    icon = 'cafe.png';
+                    break;
+            }
            if(icon) {
author	Jose Antonio Marquez	2012-06-28 09:50:28 -0700
committer	Jose Antonio Marquez	2012-06-28 09:50:28 -0700
commit	ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch)
tree	a9d5ff91681aa06bf26cb62994461a58d3f80005 /node_modules
parent	ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff)
parent	299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
download	ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz