From e23b6154ae1a8460659d8a698b6ad950a2279c2d Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Sun, 8 Feb 2015 15:16:58 -0800
Subject: [PATCH] Rename RecipeController to MinimalRecipeController

---
 src/scripts/controllers/crafting_table_controller.coffee  | 4 ++--
 src/scripts/controllers/item_page_controller.coffee       | 8 ++++++--
 ...controller.coffee => minimal_recipe_controller.coffee} | 6 +++---
 src/scripts/crafting_guide_router.coffee                  | 8 ++------
 src/templates/{recipe.jade => minimal_recipe.jade}        | 2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename src/scripts/controllers/{recipe_controller.coffee => minimal_recipe_controller.coffee} (93%)
 rename src/templates/{recipe.jade => minimal_recipe.jade} (82%)

diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee
index a8466e3fd..b82518db4 100644
--- a/src/scripts/controllers/crafting_table_controller.coffee
+++ b/src/scripts/controllers/crafting_table_controller.coffee
@@ -9,7 +9,7 @@ BaseController   = require './base_controller'
 {Duration}       = require '../constants'
 ImageLoader      = require './image_loader'
 InventoryParser  = require '../models/inventory_parser'
-RecipeController = require './recipe_controller'
+MinimalRecipeController = require './minimal_recipe_controller'
 
 ########################################################################################################################
 
@@ -44,7 +44,7 @@ module.exports = class CraftingTableController extends BaseController
     # BaseController Overrides #####################################################################
 
     onDidRender: ->
-        @recipeController = @addChild RecipeController, '.view__recipe', imageLoader:@_imageLoader, modPack:@_modPack
+        @recipeController = @addChild MinimalRecipeController, '.view__recipe', imageLoader:@_imageLoader, modPack:@_modPack
 
         @$next           = @$('.next')
         @$prev           = @$('.prev')
diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee
index 61c559bea..77d82c013 100644
--- a/src/scripts/controllers/item_page_controller.coffee
+++ b/src/scripts/controllers/item_page_controller.coffee
@@ -9,6 +9,7 @@ BaseController      = require './base_controller'
 {Duration}          = require '../constants'
 {Event}             = require '../constants'
 ImageLoader         = require './image_loader'
+Item                = require '../models/item'
 ItemGroupController = require './item_group_controller'
 ItemPage            = require '../models/item_page'
 {Url}               = require '../constants'
@@ -86,9 +87,12 @@ module.exports = class ItemPageController extends BaseController
 
     _refreshSimilarItems: ->
         group = @model.item?.group
-        @_similarItemsController.title = if group? then "Other #{group}" else 'Similar Items'
+        if group? and group isnt Item.Group.Other
+            @_similarItemsController.title = "Other #{group}"
+            @_similarItemsController.model = @model.findSimilarItems()
+        else
+            @_similarItemsController.model = null
 
-        @_similarItemsController.model = @model.findSimilarItems()
         if @_similarItemsController.model?
             @$similarContainer.fadeIn duration:Duration.fast
         else
diff --git a/src/scripts/controllers/recipe_controller.coffee b/src/scripts/controllers/minimal_recipe_controller.coffee
similarity index 93%
rename from src/scripts/controllers/recipe_controller.coffee
rename to src/scripts/controllers/minimal_recipe_controller.coffee
index 9fac2aea3..498aefe52 100644
--- a/src/scripts/controllers/recipe_controller.coffee
+++ b/src/scripts/controllers/minimal_recipe_controller.coffee
@@ -1,5 +1,5 @@
 ###
-Crafting Guide - recipe_controller.coffee
+Crafting Guide - minimal_recipe_controller.coffee
 
 Copyright (c) 2015 by Redwood Labs
 All rights reserved.
@@ -12,12 +12,12 @@ ImageLoader            = require './image_loader'
 
 ########################################################################################################################
 
-module.exports = class RecipeController extends BaseController
+module.exports = class MinimalRecipeController extends BaseController
 
     constructor: (options={})->
         if not options.modPack? then throw new Error 'options.modPack is required'
         options.imageLoader ?= new ImageLoader defaultUrl:'/images/unknown.png'
-        options.templateName = 'recipe'
+        options.templateName = 'minimal_recipe'
         super options
 
         @_imageLoader = options.imageLoader
diff --git a/src/scripts/crafting_guide_router.coffee b/src/scripts/crafting_guide_router.coffee
index a759514a6..f6f0cf051 100644
--- a/src/scripts/crafting_guide_router.coffee
+++ b/src/scripts/crafting_guide_router.coffee
@@ -70,12 +70,8 @@ module.exports = class CraftingGuideRouter extends Backbone.Router
         @_setPage 'crafting', controller
 
     item: (slug)->
-        # Temporarily re-route these to crafting until item page is complete. -- aminer 2015-02-08
-        #
-        # controller = new ItemPageController _.extend {itemSlug:slug}, @_defaultOptions
-        # @_setPage 'item', controller
-
-        @navigate "/crafting/#{slug}", trigger:true
+        controller = new ItemPageController _.extend {itemSlug:slug}, @_defaultOptions
+        @_setPage 'item', controller
 
     mod: (slug)->
         controller = new ModPageController  _.extend {}, @_defaultOptions
diff --git a/src/templates/recipe.jade b/src/templates/minimal_recipe.jade
similarity index 82%
rename from src/templates/recipe.jade
rename to src/templates/minimal_recipe.jade
index ca006f13a..6355b8b6c 100644
--- a/src/templates/recipe.jade
+++ b/src/templates/minimal_recipe.jade
@@ -1,5 +1,5 @@
 //-
-//- Crafting Guide - recipe.jade
+//- Crafting Guide - minimal_recipe.jade
 //-
 //- Copyright (c) 2015 by Redwood Labs
 //- All rights reserved.