-
- add
- multiply
- min
- max
-
+
+
+
-
-
+
+
@@ -128,7 +149,7 @@
{{operation}} {{signedEffectValue}}
{{name}}
{{#if editable}}
-
EDIT
+
{{/if}}
{{/if}}
@@ -136,7 +157,7 @@
-
+
diff --git a/rpg-docs/client/views/character/Stats/stats.js b/rpg-docs/client/views/character/Stats/stats.js
index 4c264846..183d1190 100644
--- a/rpg-docs/client/views/character/Stats/stats.js
+++ b/rpg-docs/client/views/character/Stats/stats.js
@@ -2,20 +2,56 @@ selectAttribute = function(name, title){
Session.set("selectedAttribute", name);
Session.set("selectedAttributeTitle", title);
Session.set("editingEffect", null);
- document.querySelector("#attributeDialog").toggle();
};
selectSkill = function(name, title){
Session.set("selectedSkill", name);
Session.set("selectedSkillTitle", title);
Session.set("editingEffect", null);
- document.querySelector("#skillDialog").toggle();
};
+Template.stats.created = function(){
+ this.selectedSection = new ReactiveVar(0);
+}
+
Template.stats.events({
- "click #armor": function(){
- console.log("clicked armor");
- selectAttribute("armor", "Armor")
+ "tap .attribute": function(event){
+ var instance = Template.instance();
+ var selected = $(event.currentTarget).attr("hero-id");
+ var current = Session.get("selectedAttribute");
+ var f = function(){
+ selectAttribute(selected, "Title");
+ instance.selectedSection.set(1);
+ }
+ //we already have the dialog open
+ if(instance.selectedSection.get() === 1 && current != selected){
+ instance.selectedSection.set(0);
+ _.delay(f, 200);
+ } else {
+ f();
+ }
+
+ },
+ "tap #darkOverlay": function(event){
+ Template.instance().selectedSection.set(0);
+ // let the user click through before it is completely gone
+ $("#darkOverlay").css("pointer-events", "none");
+ // make clickable again later
+ _.delay(function(){
+ $("#darkOverlay").css("pointer-events", "auto");
+ }, 500);
+ }
+});
+
+Template.stats.helpers({
+ selectedSection: function(){
+ return Template.instance().selectedSection.get();
+ },
+ isHero: function(string){
+ if(string === Session.get("selectedAttribute")||
+ string === Session.get("selectedSkill")){
+ return "hero";
+ }
}
});
@@ -59,6 +95,20 @@ Template.attributeEffect.helpers({
return this.operation;
}
},
+ operationNumber: function(){
+ switch(this.operation){
+ case "add":
+ return 0;
+ case "mul":
+ return 1;
+ case "min":
+ return 2;
+ case "max":
+ return 3;
+ default:
+ return -1;
+ }
+ },
signedEffectValue: function(){
var value = evaluateEffect(Template.parentData(1).character._id, this);
return signedString(value);
@@ -66,22 +116,23 @@ Template.attributeEffect.helpers({
});
Template.attributeEffect.events({
- "click .editButton": function(event){
+ "tap #editButton": function(event){
Session.set("editingEffect", this._id);
},
- "click #doneButton": function(event){
- var newEffect = {};
+ "tap #doneButton": function(event){
+ var newEffect = {
+
+ };
//TODO setup the changed effect
var attribute = Session.get("selectedAttribute");
var charId = Template.parentData(2)._id;
Meteor.call("updateEffect", charId, attribute, this._id, newEffect)
Session.set("editingEffect", null);
},
- "click #cancelButton": function(event){
+ "tap #cancelButton": function(event){
Session.set("editingEffect", null);
},
- "click #deleteButton": function(event){
- console.log("check that ", Template.parentData(2), "is a character");
+ "tap #deleteButton": function(event){
var attribute = Session.get("selectedAttribute");
var pullObject = {};
pullObject[attribute + ".effects"] = {_id: this._id};
diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html
index 0a9994ee..b5b28d97 100644
--- a/rpg-docs/client/views/character/characterSheet.html
+++ b/rpg-docs/client/views/character/characterSheet.html
@@ -10,11 +10,11 @@
- {{> stats}}
- features
- inventory
- spellBook
- persona
- journal
+ {{> stats}}
+ features
+ inventory
+ spellBook
+ persona
+ journal
diff --git a/rpg-docs/client/views/character/skills/skills.css b/rpg-docs/client/views/character/skills/skills.css
index 2c29b89d..71c4205b 100644
--- a/rpg-docs/client/views/character/skills/skills.css
+++ b/rpg-docs/client/views/character/skills/skills.css
@@ -19,6 +19,7 @@
/*TODO fix the actual images and remove inversion*/
-webkit-filter: invert(100%);
opacity: 0.54;
+ pointer-events: none;
}
.skillMod {
diff --git a/rpg-docs/client/views/index.html b/rpg-docs/client/views/index.html
index bcb2f040..ec06c4ee 100644
--- a/rpg-docs/client/views/index.html
+++ b/rpg-docs/client/views/index.html
@@ -5,10 +5,15 @@
+
+
+
+
+
diff --git a/rpg-docs/client/views/paperTemplates/clickCard/clickCard.html b/rpg-docs/client/views/paperTemplates/clickCard/clickCard.html
index cbfeeae6..aa73ba4a 100644
--- a/rpg-docs/client/views/paperTemplates/clickCard/clickCard.html
+++ b/rpg-docs/client/views/paperTemplates/clickCard/clickCard.html
@@ -1,5 +1,5 @@
-
+
{{> ripple}}
{{> UI.contentBlock}}