jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented UI for new parenting

Browse Source
This commit is contained in:
Thaum
2015-03-20 09:12:38 +00:00
parent ecc43752aa
commit 48f8cef928
23 changed files with 126 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
View File

@@ -8,7 +8,7 @@
<!--List dropdown-->
<paper-dropdown-menu id="listDropdown" label="Spell List">
<paper-dropdown layered class="dropdown">
<core-menu class="menu" selected={{listId}}>
<core-menu class="menu" selected={{parent.id}}>
{{#each spellLists}}
<paper-item name={{_id}} class="containerMenuItem">{{name}}</paper-item>
{{/each}}

4
rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
View File

@@ -69,8 +69,8 @@ Template.spellDialog.events({
var detail = event.originalEvent.detail;
if(!detail.isSelected) return;
var value = detail.item.getAttribute("name");
if (value == this.listId) return;
Spells.update(this._id, {$set: {listId: value}});
if (value == this.parent.id) return;
Spells.update(this._id, {$set: {"parent.id": value}});
},
"core-select #levelDropdown": function(event){
var detail = event.originalEvent.detail;

18
rpg-docs/client/views/character/spells/spells.js
View File

@@ -16,22 +16,23 @@ Template.spells.helpers({
return SpellLists.find({charId: this._id}, {sort: {color: 1, name: 1}});
},
spellCount: function(list, charId){
if(!list || !list.settings) return;
if(list.settings.showUnprepared){
return Spells.find( {charId: charId, listId: list._id, level: this.level},
return Spells.find( {charId: charId, "parent.id": list._id, level: this.level},
{fields: {_id: 1, level: 1}} ).count() > 0;
} else{
return Spells.find( {charId: charId, listId: list._id, level: this.level, prepared: {$in: ["prepared", "always"]} },
return Spells.find( {charId: charId, "parent.id": list._id, level: this.level, prepared: {$in: ["prepared", "always"]} },
{fields: {_id: 1, level: 1}} ).count() > 0;
}
},
spells: function(listId, charId){
return Spells.find( {charId: charId, listId: listId, level: this.level}, {sort: {color: 1, name: 1}} );
return Spells.find( {charId: charId, "parent.id": listId, level: this.level}, {sort: {color: 1, name: 1}} );
},
levels: function(){
return spellLevels;
},
numPrepared: function(){
return Spells.find({charId: Template.parentData()._id, listId: this._id, prepared: "prepared"}).count();
return Spells.find({charId: Template.parentData()._id, "parent.id": this._id, prepared: "prepared"}).count();
},
order: function(){
return _.indexOf(_.keys(colorOptions), this.color);
@@ -168,17 +169,20 @@ Template.spells.events({
},
"tap #addSpell": function(event){
var charId = this.charId;
var listId = this.listId;
var listId = SpellLists.findOne({charId: this._id})._id;
Spells.insert({
name: "New Spell",
charId: this._id,
listId: SpellLists.findOne({charId: this._id})._id,
parent: {
id: listId,
collection: "SpellLists"
},
prepared: "prepared"
}, function(error, id){
if(!error){
GlobalUI.setDetail({
template: "spellDialog",
data: {spellId: id, charId: charId, listId: listId},
data: {spellId: id, charId: charId},
heroId: id
});
}