From f16c01ca3d5499b9f3375698d6de4402285b6864 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Thu, 1 Jan 2015 21:38:58 -0800 Subject: [PATCH] Clear recipeName field on focus --- src/pages/test.jade | 1 - src/scripts/controllers/crafting_table_controller.coffee | 8 ++++++-- src/scripts/controllers/item_page_controller.coffee | 1 - src/scripts/models/crafting_plan.coffee | 5 ----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/pages/test.jade b/src/pages/test.jade index 73f97a505..e1b1343a6 100644 --- a/src/pages/test.jade +++ b/src/pages/test.jade @@ -12,7 +12,6 @@ append styles style #mocha-stats { position: absolute; top: 9em; } block content - #mocha append scripts diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee index e880176cb..f965fa613 100644 --- a/src/scripts/controllers/crafting_table_controller.coffee +++ b/src/scripts/controllers/crafting_table_controller.coffee @@ -6,6 +6,7 @@ ### BaseController = require './base_controller' +{Duration} = require '../constants' {Event} = require '../constants' InventoryParser = require '../models/inventory_parser' {Key} = require '../constants' @@ -47,13 +48,16 @@ module.exports = class CraftingTableController extends BaseController onNameFieldChanged: -> return unless @rendered - @model.name = @$nameField.val() + name = @$nameField.val() + @model.name = name @_craft() - # @$nameField.blur() + if name.length is 0 + setTimeout (=> @$nameField.blur()), Duration.snap onNameFieldFocused: -> return unless @rendered + @$nameField.val "" @$nameField.autocomplete 'search' diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index 43ab5edbb..99bd0c6c8 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -24,7 +24,6 @@ module.exports = class ItemPageController extends BaseController setParams: (params)-> @model.table.name = params.name if params.name? @model.table.quantity = params.quantity if params.quantity? - logger.debug "quantity updated to: #{@model.table.quantity} with params: #{params.count}" # BaseController Overrides ##################################################################### diff --git a/src/scripts/models/crafting_plan.coffee b/src/scripts/models/crafting_plan.coffee index 43d7f8c11..0c04707f5 100644 --- a/src/scripts/models/crafting_plan.coffee +++ b/src/scripts/models/crafting_plan.coffee @@ -49,7 +49,6 @@ module.exports = class CraftingPlan _processPending: -> targetItem = @_pending.pop() return unless targetItem? - logger.debug "Processing targetItem: #{targetItem}" return if @modPack.isRawMaterial targetItem.name @@ -57,13 +56,11 @@ module.exports = class CraftingPlan return if not recipes.length > 0 recipe = recipes[0] - logger.debug "Using recipe: #{recipe}" if @includingTools for tool in recipe.tools totalExpected = @result.quantityOf(tool.name) + @_expected.quantityOf(tool.name) if totalExpected < tool.quantity - logger.debug "Need to build tool: #{tool}" @_pending.add tool.name, tool.quantity @_expected.add tool.name, tool.quantity @@ -80,7 +77,6 @@ module.exports = class CraftingPlan quantityAvailable = @result.quantityOf item.name quantityUsed = Math.min quantityAvailable, item.quantity quantityNeeded = item.quantity - quantityUsed - logger.debug "processing input item: #{item}, a:#{quantityAvailable}, u:#{quantityUsed}, n:#{quantityNeeded}" @result.remove item.name, quantityUsed @_pending.add item.name, quantityNeeded @@ -90,7 +86,6 @@ module.exports = class CraftingPlan quantityMissing = @need.quantityOf item.name quantityUsed = Math.min quantityMissing, item.quantity quantityLeft = item.quantity - quantityUsed - logger.debug "processing output item: #{item}, m:#{quantityMissing}, u:#{quantityUsed}, l:#{quantityLeft}" @make.add item.name, item.quantity @need.remove item.name, quantityUsed