Merge pull request #895 from duckduckgo/brian/convert-drinks-to-new-i…

…nfobox Convert drinks spice to new InfoBox api
duckduckgo · Jun 17, 2014 · 721c211 · 721c211
2 parents b5c479a + 00f5908
commit 721c211
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/share/spice/drinks/aux.handlebars b/share/spice/drinks/aux.handlebars
diff --git a/share/spice/drinks/drinks.js b/share/spice/drinks/drinks.js
@@ -5,28 +5,33 @@ function ddg_spice_drinks(api_result) {
         return Spice.failed('drinks');
     }
 
-    api_result[0].isArray = $.isArray(api_result[0].ingredients);
-
     Spice.add({
         id: 'drinks',
         data: api_result[0],
-	name: "Recipes",
-	meta: {
+        name: "Recipes",
+        meta: {
             sourceUrl: api_result[0].url,
             sourceName: 'Drink Project'
-	},
-	normalize: function(item) {
-	    return {
-		description: item.procedure,
-		title: item.name,
-		auxTitle: 'Ingredients'
-	    };
-	},
+        },
+        normalize: function(item) {
+            var infoboxData = [{
+                heading: 'Ingredients:'
+            }];
+
+            for (var key in item.ingredients) {
+                infoboxData.push({
+                    label: item.ingredients[key]
+                });
+            }
+
+            return {
+                description: item.procedure,
+                title: item.name,
+                infoboxData: infoboxData
+            };
+        },
         templates: {
-	    group: 'info',
-	    options: {
-		aux: Spice.drinks.aux
-	    }
+            group: 'info'
         }
     });
 }