Implemented a javascript code style

rpg-docs/client/globalHelpers/GlobalUI.js

@@ -12,10 +12,10 @@ this.GlobalUI = (function() {
 		return toast.show();
 	};
 
-	GlobalUI.deletedToast = function(id, collection, itemName){
+	GlobalUI.deletedToast = function(id, collection, itemName) {
 		GlobalUI.toast({
-			text: itemName? itemName + " deleted" : "Deleted item from" + collection,
-			template: "undoToast", 
+			text: itemName ? itemName + " deleted" : "Deleted item from" + collection,
+			template: "undoToast",
 			data: {
 				id: id,
 				collection: collection
@@ -23,7 +23,7 @@ this.GlobalUI = (function() {
 		});
 	};
 
-	GlobalUI.setDialog = function(opts){
+	GlobalUI.setDialog = function(opts) {
 		this.dialog = $("[global-dialog]")[0];
 		Session.set("global.ui.dialogHeader", opts.heading);
 		Session.set("global.ui.dialogData", opts.data);
@@ -58,7 +58,7 @@ this.GlobalUI = (function() {
 		Session.set("global.ui.detailShow", true);
 	};
 
-	//if setting the detail rather than showing it, 
+	//if setting the detail rather than showing it,
 	//the template should contain the following in template.rendered
 	//
 	//if (!this.alreadyRendered){
@@ -69,30 +69,30 @@ this.GlobalUI = (function() {
 		Session.set("global.ui.detailData", opts.data);
 		Session.set("global.ui.detailTemplate", opts.template);
 		Session.set("global.ui.detailHeroId", opts.heroId);
-		if(!!(window.history && window.history.pushState)){
+		if (window.history && window.history.pushState) {
 			history.replaceState({detail: "closed", opts: opts}, "Detail Dialog");
 			history.pushState({detail: "opened", opts: opts}, "Detail Dialog");
 		}
 	};
 
-	var throttleBack = _.throttle(function(){
+	var throttleBack = _.throttle(function() {
 		history.back();
 	}, 800, {trailing: false});
 
-	GlobalUI.closeDetail = function(){
-		if(!!(window.history && window.history.pushState)){
+	GlobalUI.closeDetail = function() {
+		if (!!(window.history && window.history.pushState)) {
 			throttleBack();
-		} else{
+		} else {
 			Session.set("global.ui.detailShow", false);
 		}
 	};
 
-	GlobalUI.popStateHandler = function(e){
+	GlobalUI.popStateHandler = function(e) {
 		var state = e.originalEvent.state;
-		if(state) {
-			if(state.detail === "closed"){
+		if (state) {
+			if (state.detail === "closed") {
 				Session.set("global.ui.detailShow", false);
-			} else if(state.detail === "opened"){
+			} else if (state.detail === "opened") {
 				var opts = state.opts;
 				Session.set("global.ui.detailData", opts.data);
 				Session.set("global.ui.detailTemplate", opts.template);
@@ -115,22 +115,22 @@ Template.layout.helpers({
 	globalDialogFullOnMobile: function() {
 		return Session.get("global.ui.dialogFullOnMobile");
 	},
-	globalDialogHeader: function(){
+	globalDialogHeader: function() {
 		return Session.get("global.ui.dialogHeader");
 	},
-	globalDetailSelected: function(){
+	globalDetailSelected: function() {
 		return Session.get("global.ui.detailShow") ? 1 : 0;
 	},
-	globalDetailTemplate: function(){
+	globalDetailTemplate: function() {
 		return Session.get("global.ui.detailTemplate");
 	},
-	globalDetailData: function(){
+	globalDetailData: function() {
 		return Session.get("global.ui.detailData");
 	},
-	globalToastTemplate: function(){
+	globalToastTemplate: function() {
 		return Session.get("global.ui.toastTemplate");
 	},
-	globalToastData: function(){
+	globalToastData: function() {
 		return Session.get("global.ui.toastData");
 	}
 });
@@ -143,7 +143,7 @@ Template.layout.events({
 	},
 	"core-animated-pages-transition-end [detail-pages]": function(e) {
 		var detailOpened = Session.get("global.ui.detailShow");
-		if(!detailOpened){
+		if (!detailOpened) {
 			Session.set("global.ui.detailData", null);
 			Session.set("global.ui.detailTemplate", null);
 			Session.set("global.ui.detailHeroId", null);
@@ -151,14 +151,14 @@ Template.layout.events({
 	},
 	"core-animated-pages-transition-prepare": function(e) {
 		var detailOpened = Session.get("global.ui.detailShow");
-		if(detailOpened) {
+		if (detailOpened) {
 			//set up the transition
 		} else {
 			//undo hack
 			$("#mainContentSection").removeClass("fake-selected");
 		}
 	},
-	"tap #screenDim": function(e){
+	"tap #screenDim": function(e) {
 		GlobalUI.closeDetail();
 	}
 });

rpg-docs/client/globalHelpers/canCast.js

@@ -1,3 +1,3 @@
-Template.registerHelper("canCast", function(){
+Template.registerHelper("canCast", function() {
 	return Characters.find({_id: this._id, spells: {$size: 0}}).count() === 0;
-});
+});

rpg-docs/client/globalHelpers/colorClass.js

@@ -1,8 +1,11 @@
-Template.registerHelper("colorClass", function(color){
-	if(color) return getColorClass(color);
-	else if(this.color) return getColorClass(this.color);
+Template.registerHelper("colorClass", function(color) {
+	if (color) {
+		return getColorClass(color);
+	} else if (this.color) {
+		return getColorClass(this.color);
+	}
 });
 
-Template.registerHelper("hexColor", function(color){
+Template.registerHelper("hexColor", function(color) {
 	return getHexColor(color);
 });

rpg-docs/client/globalHelpers/detailHero.js

@@ -1,7 +1,9 @@
-Template.registerHelper("detailHero", function(suffix, givenId){
+Template.registerHelper("detailHero", function(suffix, givenId) {
 	var id = givenId || this._id;
-	if(suffix) id += suffix;
-	if ( Session.equals("global.ui.detailHeroId", id) ) {
+	if (suffix) {
+		id += suffix;
+	}
+	if (Session.equals("global.ui.detailHeroId", id)) {
 		return "hero";
 	}
-});
+});

rpg-docs/client/globalHelpers/effectList.js

@@ -1,124 +0,0 @@
-/*Template.registerHelper(function("effectList", */var disabled = function(charId, fieldName){
-	var obj = Characters.findOne(charId, {fields: {_id: 1}}).getField(fieldName);
-	var result = $("<div>");
-	if(_.has(obj, "conditional") && obj.conditional.length > 0){
-		_.each(obj.conditional, function(cond){
-			var c = $("<div>")
-			.append("* ")
-			.append(evaluateString(charId, cond.name));
-			result.append(c);
-		});
-	}
-
-	if(obj.base > 0){
-		var c = $("<div>")
-		.append($("<span>").addClass("auditValue").append(obj.base))
-		.append("Base");
-		result.append(c);
-	}
-
-	if(_.has(obj, "proficiency") && obj.proficiency.length > 0){
-		var highestProf = {};
-		_.each(obj.proficiency, function(prof, i){
-			var value = evaluateEffect(charId, prof)
-			if(i === 0 || value > highestProf.value){
-				highestProf.value = value;
-				highestProf.name = prof.name;
-				highestProf.calculation = prof.calculation;
-			}
-		});
-		var c = $("<div>")
-		.append($("<span>").addClass("auditValue").append(highestProf.value).append(" x Proficiency Bonus"))
-		.append(highestProf.name);
-		result.append(c);
-	}
-
-	if(_.has(obj, "add") && obj.add.length > 0){
-		_.each(obj.add, function(a){
-			var value = signedString(evaluateEffect(charId, a));
-			var c = $("<div>")
-			.append($("<span>").addClass("auditValue").append(value))
-			.append(a.name);
-			result.append(c);
-		});
-	}
-
-	if(_.has(obj, "mul") && obj.mul.length > 0){
-		_.each(obj.mul, function(a){
-			var value = signedString(evaluateEffect(charId, a));
-			var c = $("<div>")
-			.append($("<span>").addClass("auditValue").append("&times;").append(value))
-			.append(a.name);
-			result.append(c);
-		});
-	}
-
-	if(_.has(obj, "min") && obj.min.length > 0){
-		var highestMin = {};
-		_.each(obj.min, function(m, i){
-			var value = evaluateEffect(charId, m)
-			if(i === 0 || value > highestMin.value){
-				highestMin.value = value;
-				highestMin.name = m.name;
-				highestMin.calculation = m.calculation;
-			}
-		});
-		var c = $("<div>")
-		.append($("<span>").addClass("auditValue").append(highestMin.value).append(" Minimum"))
-		.append(highestMin.name);
-		result.append(c);
-	}
-
-	if(_.has(obj, "max") && obj.max.length > 0){
-		var lowestMax = {};
-		_.each(obj.max, function(m, i){
-			var value = evaluateEffect(charId, m)
-			if(i === 0 || value < lowestMax.value){
-				lowestMax.value = value;
-				lowestMax.name = m.name;
-				lowestMax.calculation = m.calculation;
-			}
-		});
-		var c = $("<div>")
-		.append($("<span>").addClass("auditValue").append(lowestMax.value).append(" Maximum"))
-		.append(lowestMax.name);
-		result.append(c);
-	}
-
-	if(obj.base < 0){
-		var c = $("<div>")
-		.append($("<span>").addClass("auditValue").append(obj.base))
-		.append("Damage");
-		result.append(c);
-	}
-
-	if(_.has(obj, "advantage") && obj.advantage.length > 0){
-		_.each(obj.advantage, function(adv){
-			var c = $("<div>")
-			.append($("<span>").addClass("auditValue").append("Advantage"))
-			.append(adv.name);
-			result.append(c);
-		})
-	}
-
-	if(_.has(obj, "disadvantage") && obj.disadvantage.length > 0){
-		_.each(obj.disadvantage, function(disadv){
-			var c = $("<div>")
-			.append($("<span>").addClass("auditValue").append("Disadvantage"))
-			.append(disadv.name);
-			result.append(c);
-		})
-	}
-
-	if(_.has(obj, "fail") && obj.fail.length > 0){
-		_.each(obj.fail, function(f){
-			var c = $("<div>")
-			.append($("<span>").addClass("auditValue").append("Fail"))
-			.append(f.name);
-			result.append(c);
-		})
-	}
-	var string = result.html()
-	if (_.isString(string)) return Spacebars.SafeString(string);
-	return string;
-};

rpg-docs/client/globalHelpers/evaluate.js

@@ -1,25 +1,25 @@
-Template.registerHelper("evaluate", function(charId, string){
+Template.registerHelper("evaluate", function(charId, string) {
 	return evaluate(charId, string);
 });
 
-Template.registerHelper("evaluateSigned", function(charId, string){
+Template.registerHelper("evaluateSigned", function(charId, string) {
 	var number = evaluate(charId, string);
-	if(_.isFinite(number)){
-		return number > 0? "+" + number : "" + number;
-	} else{
+	if (_.isFinite(number)) {
+		return number > 0 ? "+" + number : "" + number;
+	} else {
 		return number;
 	}
 });
 
-Template.registerHelper("evaluateSignedSpaced", function(charId, string){
+Template.registerHelper("evaluateSignedSpaced", function(charId, string) {
 	var number = evaluate(charId, string);
-	if(_.isFinite(number)){
-		return number > 0? "+ " + number : "- " + (-1 * number);
-	} else{
+	if (_.isFinite(number)) {
+		return number > 0 ? "+ " + number : "- " + (-1 * number);
+	} else {
 		return number;
 	}
 });
 
-Template.registerHelper("evaluateString", function(charId, string){
+Template.registerHelper("evaluateString", function(charId, string) {
 	return evaluateString(charId, string);
 });

rpg-docs/client/globalHelpers/openParentDialog.js

@@ -1,21 +1,21 @@
-openParentDialog = function(parent, charId, heroId){
+openParentDialog = function(parent, charId, heroId) {
 	var detail;
-	if(parent.collection === "Characters" && parent.group === "racial"){
+	if (parent.collection === "Characters" && parent.group === "racial") {
 		detail = {
 			template: "raceDialog",
 			data: {charId: parent.id},
 		};
-	} else if( parent.collection === "Features" ){
+	} else if (parent.collection === "Features") {
 		detail = {
 			template: "featureDialog",
 			data:     {featureId: parent.id},
 		};
-	} else if( parent.collection === "Classes" ){
+	} else if (parent.collection === "Classes") {
 		detail = {
 			template: "classDialog",
 			data: {classId: parent.id},
 		};
-	} else if( parent.collection === "Items" ){
+	} else if (parent.collection === "Items") {
 		detail = {
 			template: "itemDialog",
 			data:     {itemId: parent.id},

rpg-docs/client/globalHelpers/round.js

@@ -1,6 +1,6 @@
-Template.registerHelper("round", function(value, decimalPlaces){
+Template.registerHelper("round", function(value, decimalPlaces) {
 	decimalPlaces = +decimalPlaces || 2;
 	var num = +value;
-	var tens = Math.pow(10, decimalPlaces)
+	var tens = Math.pow(10, decimalPlaces);
 	return Math.round(num * tens) / tens;
-});
+});

rpg-docs/client/globalHelpers/session.js

@@ -1,3 +1,3 @@
-Template.registerHelper("session", function(key){
+Template.registerHelper("session", function(key) {
 	return Session.get(key);
-});
+});

rpg-docs/client/globalHelpers/signedString.js

@@ -1,3 +1,3 @@
-Template.registerHelper("signedString", function(number){
-	return number >= 0? "+" + number : "" + number;
-});
+Template.registerHelper("signedString", function(number) {
+	return number >= 0 ? "+" + number : "" + number;
+});

rpg-docs/client/globalHelpers/valueString.js

@@ -1,21 +1,27 @@
-Template.registerHelper("valueString", function(value){
+Template.registerHelper("valueString", function(value) {
 	var resultArray = [];
 	//sp
 	var gp = Math.floor(value);
-	if(gp > 0) resultArray.push(gp + "gp");
+	if (gp > 0) {
+		resultArray.push(gp + "gp");
+	}
 	//sp
 	var sp = Math.floor(10 * (value % 1));
-	if(sp > 0) resultArray.push(sp + "sp");
+	if (sp > 0) {
+		resultArray.push(sp + "sp");
+	}
 	//cp
 	var cp = 10 * ((value * 10) % 1);
 	cp = Math.round(cp * 1000) / 1000;
-	if(cp > 0) resultArray.push(cp + "cp");
+	if (cp > 0) {
+		resultArray.push(cp + "cp");
+	}
 
 	//build string with correct spacing
 	var result = "";
-	for(var i = 0; i < resultArray.length; i++){
+	for (var i = 0; i < resultArray.length; i++) {
 		//add a space between values
-		if(i !== 0){
+		if (i !== 0) {
 			result += " ";
 		}
 		result += resultArray[i];
@@ -23,24 +29,30 @@ Template.registerHelper("valueString", function(value){
 	return result;
 });
 
-Template.registerHelper("longValueString", function(value){
+Template.registerHelper("longValueString", function(value) {
 	var resultArray = [];
 	//sp
 	var gp = Math.floor(value);
-	if(gp > 0) resultArray.push(gp + "gp");
+	if (gp > 0) {
+		resultArray.push(gp + "gp");
+	}
 	//sp
 	var sp = Math.floor(10 * (value % 1));
-	if(sp > 0 || resultArray.length) resultArray.push(sp + "sp");
+	if (sp > 0 || resultArray.length) {
+		resultArray.push(sp + "sp");
+	}
 	//cp
 	var cp = 10 * ((value * 10) % 1);
 	cp = Math.round(cp * 1000) / 1000;
-	if(cp > 0 || resultArray.length) resultArray.push(cp + "cp");
+	if (cp > 0 || resultArray.length) {
+		resultArray.push(cp + "cp");
+	}
 
 	//build string with correct spacing
 	var result = "";
-	for(var i = 0; i < resultArray.length; i++){
+	for (var i = 0; i < resultArray.length; i++) {
 		//add a space between values
-		if(i !== 0){
+		if (i !== 0) {
 			result += " ";
 		}
 		result += resultArray[i];