From 3eced2e314c82e44798896a710f47033b5df4932 Mon Sep 17 00:00:00 2001 From: Thaum Date: Wed, 8 Apr 2015 05:15:54 +0000 Subject: [PATCH] Fixed deleting of assets which aren't parents or children --- rpg-docs/.meteor/versions | 4 ++-- .../journal/experienceDialog/experienceDialog.js | 10 +++++----- .../views/character/journal/noteDialog/noteDialog.js | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 43137a6e..84bcfa86 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -18,7 +18,7 @@ dburles:collection-helpers@1.0.3 dburles:mongo-collection-instances@0.3.3 ddp@1.1.0 deps@1.0.7 -differential:vulcanize@0.0.3 +differential:vulcanize@0.0.4 ejson@1.0.6 email@1.0.6 fastclick@1.0.3 @@ -50,7 +50,7 @@ mike:mocha@0.5.2 minifiers@1.1.5 minimongo@1.0.8 mobile-status-bar@1.0.3 -momentjs:moment@2.9.0 +momentjs:moment@2.10.0 mongo@1.1.0 npm-bcrypt@0.7.8_2 observe-sequence@1.0.6 diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js index 2e58c463..6aaec305 100644 --- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js +++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js @@ -1,20 +1,20 @@ Template.experienceDialog.events({ "tap #deleteButton": function(event, instance){ - Experiences.softRemoveNode(instance.data.experienceId); + Experiences.softRemove(instance.data.experienceId); GlobalUI.deletedToast(instance.data.experienceId, "Experiences", "Experience"); - GlobalUI.closeDetail() + GlobalUI.closeDetail(); }, //TODO validate input (integer, non-negative, etc) for these inputs and give validation errors "change #experienceNameInput, input #experienceNameInput": function(event){ - var value = event.currentTarget.value + var value = event.currentTarget.value; Experiences.update(this._id, {$set: {name: value}}); }, "change #valueInput": function(event){ - var value = +event.currentTarget.value + var value = +event.currentTarget.value; Experiences.update(this._id, {$set: {value: value}}); }, "change #experienceDescriptionInput": function(event){ - var value = event.currentTarget.value + var value = event.currentTarget.value; Experiences.update(this._id, {$set: {description: value}}); } }); diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js index 7115c904..c935645c 100644 --- a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js +++ b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js @@ -3,16 +3,16 @@ Template.noteDialog.events({ Notes.update(instance.data.noteId, {$set: {color: event.color}}); }, "tap #deleteButton": function(event, instance){ - Notes.softRemoveNode(instance.data.noteId); + Notes.softRemove(instance.data.noteId); GlobalUI.deletedToast(instance.data.noteId, "Notes", "Note"); - GlobalUI.closeDetail() + GlobalUI.closeDetail(); }, "change #noteNameInput, input #noteNameInput": function(event){ - var value = event.currentTarget.value + var value = event.currentTarget.value; Notes.update(this._id, {$set: {name: value}}); }, "change #noteDescriptionInput": function(event){ - var value = event.currentTarget.value + var value = event.currentTarget.value; Notes.update(this._id, {$set: {description: value}}); } });