From 2dd4b7014fdab9ce124b191b2a3cc4c466c58dfc Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 29 Dec 2014 12:38:07 -0800 Subject: [PATCH] Continue to look for recipes in disabled books Update models so that when a recipe book is disabled, it no longer is used for finding names to display in the UI, but it is still used for finding recipes to make. --- src/scripts/models/recipe_book.coffee | 4 ---- src/scripts/models/recipe_catalog.coffee | 1 + src/templates/recipe_catalog.jade | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/scripts/models/recipe_book.coffee b/src/scripts/models/recipe_book.coffee index a080aa0e1..77c0fa816 100644 --- a/src/scripts/models/recipe_book.coffee +++ b/src/scripts/models/recipe_book.coffee @@ -23,8 +23,6 @@ module.exports = class RecipeBook extends BaseModel # Public Methods ############################################################################### gatherNames: (result)-> - return unless @enabled - for recipe in @recipes continue if result[recipe.name] result[recipe.name] = value:recipe.name, label:"#{recipe.name} (from #{@modName} #{@modVersion})" @@ -32,8 +30,6 @@ module.exports = class RecipeBook extends BaseModel return result gatherRecipes: (name, result)-> - return unless @enabled - for recipe in @recipes if recipe.name is name result.push recipe diff --git a/src/scripts/models/recipe_catalog.coffee b/src/scripts/models/recipe_catalog.coffee index 82771e10d..e50d2ef9c 100644 --- a/src/scripts/models/recipe_catalog.coffee +++ b/src/scripts/models/recipe_catalog.coffee @@ -24,6 +24,7 @@ module.exports = class RecipeCatalog extends BaseModel gatherNames: -> nameData = {} for book in @books + continue unless book.enabled book.gatherNames nameData result = [] diff --git a/src/templates/recipe_catalog.jade b/src/templates/recipe_catalog.jade index 0bc86e524..728993099 100644 --- a/src/templates/recipe_catalog.jade +++ b/src/templates/recipe_catalog.jade @@ -17,4 +17,3 @@ td input.recipe_book_url(placeholder="enter a URL to load another recipe book...") button.recipe_book_load_button Load - .load_error: p