From 3e70c0deef888951be24ca1a016fa345def36b3c Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 12 Jan 2015 12:56:24 -0800 Subject: [PATCH] Show tooltips for items in crafting grid --- src/scripts/controllers/crafting_grid_controller.coffee | 3 +++ src/scripts/controllers/crafting_table_controller.coffee | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/scripts/controllers/crafting_grid_controller.coffee b/src/scripts/controllers/crafting_grid_controller.coffee index f726b8a50..8706cfb40 100644 --- a/src/scripts/controllers/crafting_grid_controller.coffee +++ b/src/scripts/controllers/crafting_grid_controller.coffee @@ -6,6 +6,7 @@ All rights reserved. ### BaseController = require './base_controller' +{Duration} = require '../constants' ImageLoader = require './image_loader' ######################################################################################################################## @@ -42,7 +43,9 @@ module.exports = class CraftingGridController extends BaseController if display? slot.a.removeClass 'empty' slot.a.attr 'href', display.itemUrl + slot.a.attr 'title', display.itemName @_imageLoader.load display.iconUrl, slot.img slot.img.attr 'alt', display.itemName + @$el.tooltip show:{delay:Duration.slow, duration:Duration.fast} super diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee index 209a3b356..7f9493036 100644 --- a/src/scripts/controllers/crafting_table_controller.coffee +++ b/src/scripts/controllers/crafting_table_controller.coffee @@ -7,6 +7,7 @@ All rights reserved. BaseController = require './base_controller' CraftingGridController = require './crafting_grid_controller' +{Duration} = require '../constants' ImageLoader = require './image_loader' ######################################################################################################################## @@ -70,6 +71,7 @@ module.exports = class CraftingTableController extends BaseController if outputStack? display = @modPack.findItemDisplay outputStack.itemSlug @$outputLink.attr 'href', display.itemUrl + @$outputLink.attr 'title', display.itemName @$outputImg.attr 'alt', display.itemName @$outputQuantity.html outputStack.quantity if outputStack.quantity > 1 @@ -80,6 +82,7 @@ module.exports = class CraftingTableController extends BaseController else @$multiplier.html '' + @$el.tooltip show:{delay:Duration.slow, duration:Duration.fast} super # Backbone.View Overrides ######################################################################