Fix keneanung/#3

The ingredient tree and shopping list should now show tooltips again instead of "loading" indefinitely.
rubensayshi · Oct 8, 2014 · f549d5b · f549d5b
1 parent f0cde49
commit f549d5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controllers/helpers.php b/controllers/helpers.php
@@ -284,7 +284,7 @@ function buildMultiRecipeTree($item, $app, $recipe = null) {
 
 function buildRecipeTree($item, $app, $recipe = null, $multiplier = 1) {
     $tree = array(
-        'id' => $item->getDataId(),
+        'dataId' => $item->getDataId(),
         'name' => $item->getName(),
         'href' => $app['url_generator']->generate('item', array('dataId' => $item->getDataId())),
         'rarity' => $item->getRarityName(),

diff --git a/webroot/assets/js/crafting.js b/webroot/assets/js/crafting.js
@@ -20,10 +20,10 @@ var Crafting = function(item, container, summarycontainer) {
 
         ingredients = {};
         $.each(topentry.ingredients(), function(k, ingredient) {
-            if (ingredients[ingredient[1].id] == undefined) {
-                ingredients[ingredient[1].id] = ingredient;
+            if (ingredients[ingredient[1].dataId] == undefined) {
+                ingredients[ingredient[1].dataId] = ingredient;
             } else {
-                ingredients[ingredient[1].id][0] += ingredient[0];
+                ingredients[ingredient[1].dataId][0] += ingredient[0];
             }
         });