From 826575263ea96e9c98e8e64ebaa2234b377786ca Mon Sep 17 00:00:00 2001
From: Thaum <stefanzermatten@gmail.com>
Date: Mon, 16 Feb 2015 10:28:15 +0000
Subject: [PATCH] Fixed effect edit value dropdowns

---
 .../client/views/character/characterSheet.css |  4 +--
 .../character/effectEdit/effectEdit.html      | 21 +++++---------
 .../views/character/effectEdit/effectEdit.js  | 29 ++++---------------
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/rpg-docs/client/views/character/characterSheet.css b/rpg-docs/client/views/character/characterSheet.css
index 2a1480b9..e409732f 100644
--- a/rpg-docs/client/views/character/characterSheet.css
+++ b/rpg-docs/client/views/character/characterSheet.css
@@ -11,11 +11,11 @@ paper-tabs[noink][nobar] paper-tab.core-selected {
 	color: #fff;
 }
 
-::shadow #selectionBar, #onRadio  {
+paper-tabs /deep/ #selectionBar, #onRadio  {
 	background-color: #d50000;
 }
 
-::shadow #ink {
+paper-tabs ::shadow #ink {
 	color: #b22 !important;
 }
 
diff --git a/rpg-docs/client/views/character/effectEdit/effectEdit.html b/rpg-docs/client/views/character/effectEdit/effectEdit.html
index fd0096be..8c048760 100644
--- a/rpg-docs/client/views/character/effectEdit/effectEdit.html
+++ b/rpg-docs/client/views/character/effectEdit/effectEdit.html
@@ -1,6 +1,6 @@
 <template name="effectEdit">
-	<div class="effectEdit">
-		<paper-dropdown-menu id="statGroupDropDown" label="Stat Group">
+	<div class="effectEdit" layout horizontal center>
+		<paper-dropdown-menu id="statGroupDropDown" label="Stat Group" flex>
 			<paper-dropdown layered class="dropdown">
 				<core-menu id="statGroupMenu" class="menu" selected={{selectedStatGroup}}>
 					{{#each statGroups}}
@@ -10,7 +10,7 @@
 			</paper-dropdown>
 		</paper-dropdown-menu>
 		{{#if stats}}
-			<paper-dropdown-menu id="statDropDown" label="Stat">
+			<paper-dropdown-menu id="statDropDown" label="Stat" flex>
 				<paper-dropdown layered class="dropdown">
 					<core-menu id="statMenu" class="menu"  selected={{stat}} on-tap="onStatMenuTap">
 						{{#each stats}}
@@ -21,7 +21,7 @@
 			</paper-dropdown-menu>
 		{{/if}}
 		{{#if operations}}
-			<paper-dropdown-menu id="operationDropDown" label="Operation">
+			<paper-dropdown-menu id="operationDropDown" label="Operation" flex>
 				<paper-dropdown layered class="dropdown">
 					<core-menu id="operationMenu" class="menu" selected={{operation}}>
 						{{#each operations}}
@@ -32,22 +32,17 @@
 			</paper-dropdown-menu>
 		{{/if}}
 		{{> Template.dynamic template=effectValueTemplate}}
-		{{#if needsCommit}}
-			<paper-icon-button id="commitChanges" role="button" tabindex="0" icon="check" aria-label="Commit Changes"></paper-icon-button>
-			<paper-icon-button id="clearChanges" role="button" tabindex="0" icon="clear" aria-label="Clear Changes"></paper-icon-button>
-		{{else}}
-			<paper-icon-button id="deleteEffect" role="button" tabindex="0" icon="delete" aria-label="Delete"></paper-icon-button>
-		{{/if}}
+		<paper-icon-button id="deleteEffect" role="button" tabindex="0" icon="delete" aria-label="Delete"></paper-icon-button>
 		<br>
 	</div>
 </template>
 
 <template name="regularEffectValue">
-	<paper-input id="effectValueInput" label="Value" floatinglabel value={{effectValue}}></paper-input>
+	<paper-input id="effectValueInput" label="Value" floatinglabel value={{effectValue}} flex></paper-input>
 </template>
 
 <template name="multiplierEffectValue">
-	<paper-dropdown-menu id="damageMultiplierDropDown" label="Damage Multiplier">
+	<paper-dropdown-menu id="damageMultiplierDropDown" label="Damage Multiplier" flex>
 		<paper-dropdown layered class="dropdown">
 			<core-menu id="multiplierMenu" class="menu" selected={{value}}>
 				<paper-item name="0.5">Resistance</paper-item>
@@ -59,7 +54,7 @@
 </template>
 
 <template name="proficiencyEffectValue">
-	<paper-dropdown-menu id="proficiencyDropDown" label="Proficiency">
+	<paper-dropdown-menu id="proficiencyDropDown" label="Proficiency" flex>
 		<paper-dropdown layered class="dropdown">
 			<core-menu id="proficiencyMenu" class="menu" selected={{value}}>
 				<paper-item name="1">Proficient</paper-item>
diff --git a/rpg-docs/client/views/character/effectEdit/effectEdit.js b/rpg-docs/client/views/character/effectEdit/effectEdit.js
index fa322990..5dc538dc 100644
--- a/rpg-docs/client/views/character/effectEdit/effectEdit.js
+++ b/rpg-docs/client/views/character/effectEdit/effectEdit.js
@@ -170,33 +170,16 @@ Template.effectEdit.events({
 	"core-select #damageMultiplierDropDown": function(event){
 		var detail = event.originalEvent.detail;
 		if(!detail.isSelected) return;
-		var selected = detail.item.getAttribute("name");
-		if(selected === "resistance"){
-			if(this.operation == "mul" && this.value == 0.5) return;
-			Effects.update(this._id, {$set: {operation: "mul", value: 0.5, calculation: ""}});
-		} else if (selected === "vulnerability"){
-			if(this.operation == "mul" && this.value == 2) return;
-			Effects.update(this._id, {$set: {operation: "mul", value: 2, calculation: ""}});
-		} else if (selected === "immunity"){
-			if(this.operation == "max" && this.value == 0) return;
-			Effects.update(this._id, {$set: {operation: "max", value: 0, calculation: ""}});
-		}	
+		var value = +detail.item.getAttribute("name");
+		if (value == this.value) return;
+		Effects.update(this._id, {$set: {value: value, calculation: ""}});
 	},
 	"core-select #proficiencyDropDown": function(event){
 		var detail = event.originalEvent.detail;
 		if(!detail.isSelected) return;
-		var selected = detail.item.getAttribute("name");
-		var inst = Template.instance();
-		if(selected === "proficient"){
-			if(this.value == 1) return;
-			Effects.update(this._id, {$set: {value: 1}});
-		} else if (selected === "half"){
-			if(this.value == 0.5) return;
-			Effects.update(this._id, {$set: {value: 0.5}});
-		} else if (selected === "double"){
-			if(this.value == 2) return;
-			Effects.update(this._id, {$set: {value: 2}});
-		}
+		var value = +detail.item.getAttribute("name");
+		if (value == this.value) return;
+		Effects.update(this._id, {$set: {value: value, calculation: ""}});
 	},
 	"change #effectValueInput": function(event){
 		var value = event.currentTarget.value;