codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request from laituan245/master

Browse source 
Fix issue  (Equipping with little equip button doesn't update big equip button)
This commit is contained in:
Nick Winter 2015-02-18 08:58:36 -08:00
commit 1a44b3ff5a
1 changed files with 3 additions and 0 deletions

3
app/views/play/menu/InventoryModal.coffee
View file

@ -250,6 +250,7 @@ module.exports = class InventoryModal extends ModalView
onUnequippedItemClick: (e) -> onUnequippedItemClick: (e) ->
return if @justDoubleClicked return if @justDoubleClicked
return if @justClickedEquipItemButton
itemEl = $(e.target).closest('.item') itemEl = $(e.target).closest('.item')
#@playSound 'menu-button-click' #@playSound 'menu-button-click'
@selectUnequippedItem(itemEl) @selectUnequippedItem(itemEl)
@ -270,6 +271,8 @@ module.exports = class InventoryModal extends ModalView
itemEl = $(e.target).closest('.item') itemEl = $(e.target).closest('.item')
@selectUnequippedItem(itemEl) @selectUnequippedItem(itemEl)
@equipSelectedItem() @equipSelectedItem()
@justClickedEquipItemButton = true
_.defer => @justClickedEquipItemButton = false
#- Select/equip higher-level, all encompassing methods the callbacks all use #- Select/equip higher-level, all encompassing methods the callbacks all use