Fixed parenting. Started on UI rewrite for new parenting system

rpg-docs/client/views/character/features/featureDialog/featureDialog.js

@@ -32,8 +32,16 @@ Template.featureDialog.events({
 		var detail = event.originalEvent.detail;
 		if(!detail.isSelected) return;
 		var value = detail.item.getAttribute("name");
-		if (value === this.enabled) return;
-		Features.update(this._id, {$set: {enabled: value}});
+		var setter;
+		if(value === "enabled"){
+			setter = {enabled: true, alwaysEnabled: false};
+		} else if (value === "disabled"){
+			setter = {enabled: false, alwaysEnabled: false};
+		} else{
+			setter = {enabled: true, alwaysEnabled: true};
+		}
+		if (setter.enabled === this.enabled && setter.alwaysEnabled === this.alwaysEnabled) return;
+		Features.update(this._id, {$set: setter});
 	},
 });
 

rpg-docs/client/views/character/features/features.html

@@ -71,7 +71,7 @@
 							<paper-ripple fit></paper-ripple>
 							{{#if canEnable}}
 								<core-tooltip label="Feature enabled" position="left">
-									<paper-checkbox class="enabledCheckbox" checked={{isEnabled}}></paper-checkbox>
+									<paper-checkbox class="enabledCheckbox" checked={{enabled}}></paper-checkbox>
 								</core-tooltip>
 							{{/if}}
 						</div>

rpg-docs/client/views/character/features/features.js

@@ -26,10 +26,7 @@ Template.features.helpers({
 		return char && char.proficiencies;
 	},
 	canEnable: function(){
-		return this.enabled !== "alwaysEnabled";
-	},
-	isEnabled: function(){
-		return this.enabled !== "disabled";
+		return !this.alwaysEnabled;
 	}
 });
 
@@ -94,9 +91,7 @@ Template.features.events({
 		event.stopPropagation();
 	},
 	"change .enabledCheckbox": function(event){
-		var enabled;
-		if(this.enabled === "enabled") enabled = "disabled";
-		else enabled = "enabled";
+		var enabled = !this.enabled;
 		Features.update(this._id, {$set: {enabled: enabled}});
 	}
 });