From 20340fac77d8a32892ddfbd171d4be63cbc433cd Mon Sep 17 00:00:00 2001 From: Thaum Date: Tue, 4 Nov 2014 07:12:59 +0000 Subject: [PATCH] Added dburles:collection-helpers to fix transformations --- TODO.md | 1 - rpg-docs/.meteor/packages | 1 + rpg-docs/.meteor/versions | 1 + rpg-docs/Model/Character/Characters.js | 4 ++-- rpg-docs/Routes/Routes.js | 10 ---------- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/TODO.md b/TODO.md index e6f6f862..da5431b8 100644 --- a/TODO.md +++ b/TODO.md @@ -3,7 +3,6 @@ Character.js is under construction... expect broken character sheets issues ------ -* hot code pushes don't apply transforms correctly Characters attributes and buffs ------------------------------- diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index 1007889f..4fcfc4bd 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -10,4 +10,5 @@ iron:router accounts-password accounts-ui random +dburles:collection-helpers diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index c0c1f8d3..95d1cef1 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -14,6 +14,7 @@ callback-hook@1.0.1 check@1.0.2 ctl-helper@1.0.4 ctl@1.0.2 +dburles:collection-helpers@1.0.1 ddp@1.0.11 deps@1.0.5 ejson@1.0.4 diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js index 108d9a67..b914b8de 100644 --- a/rpg-docs/Model/Character/Characters.js +++ b/rpg-docs/Model/Character/Characters.js @@ -153,7 +153,7 @@ Character = function(owner){ } //functions and calculated values go here -protoCharacter = { +Characters.helpers({ attributeValue: function(attribute){ if (attribute === undefined) return; //base value @@ -282,7 +282,7 @@ protoCharacter = { } } } -} +}); getMod = function(score){ return Math.floor((score-10)/2); diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js index 8179364c..d041cd27 100644 --- a/rpg-docs/Routes/Routes.js +++ b/rpg-docs/Routes/Routes.js @@ -14,13 +14,6 @@ Router.map( function () { notFoundTemplate: 'characterNotFound', data: function() { var data = Characters.findOne({_id: this.params._id}); - data.features = Features.find({character: data._id}); - data.containers = Containers.find({owner: data._id}); - data.containers.forEach(function(container){ - container.items = Items.find({container: container._id}); - }); - var newInstance = Object.create(protoCharacter); - data = _.extend(newInstance, data); return data; } }); @@ -31,9 +24,6 @@ Router.map( function () { data: { containers: function() { var containers = Containers.find({owner: data._id}); - containers.forEach(function(container){ - container.items = Items.find({container: container._id}); - }); return containers; },