From 49a98aec96afc2d67bb5d0288b7f3bbcb53630c4 Mon Sep 17 00:00:00 2001 From: Thaum Date: Thu, 16 Apr 2015 09:07:29 +0000 Subject: [PATCH] Fixed color-change and delete regression on item dialogs --- .../character/inventory/itemDialog/itemDialog.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js index 797aa57c..3d379139 100644 --- a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js +++ b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js @@ -30,6 +30,14 @@ Template.itemDialog.events({ "tap #doneEditingButton": function(event, instance){ instance.editing.set(false); }, + "color-change": function(event, instance){ + Items.update(instance.data.itemId, {$set: {color: event.color}}); + }, + "tap #deleteButton": function(event, instance){ + Items.softRemoveNode(instance.data.itemId); + GlobalUI.deletedToast(instance.data.itemId, "Items", "Item"); + GlobalUI.closeDetail(); + }, }); Template.itemEdit.helpers({ @@ -39,14 +47,6 @@ Template.itemEdit.helpers({ }); Template.itemEdit.events({ - "color-change": function(event, instance){ - Items.update(instance.data.itemId, {$set: {color: event.color}}); - }, - "tap #deleteButton": function(event, instance){ - Items.softRemoveNode(instance.data.itemId); - GlobalUI.deletedToast(instance.data.itemId, "Items", "Item"); - GlobalUI.closeDetail(); - }, //TODO validate input (integer, non-negative, etc) for these inputs and give validation errors "change #itemNameInput": function(event){ var name = Template.instance().find("#itemNameInput").value;