From 737a482d59c1f57fc7993edf7438335ed918b7a0 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Thu, 16 May 2019 22:02:17 +0200 Subject: [PATCH] yoda problems --- src/js/colorinput.js | 16 ++++++++-------- src/js/descriptionWidgets.js | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/js/colorinput.js b/src/js/colorinput.js index b97711b59ca..0bd884a15bf 100644 --- a/src/js/colorinput.js +++ b/src/js/colorinput.js @@ -4,9 +4,9 @@ Macro.add("colorinput", { let e = []; return this.args.length < 1 && e.push("variable name"), this.args.length < 2 && e.push("default value"), this.error("no " + e.join(" or ") + " specified"); } - if ("string" !== typeof this.args[0]) { return this.error("variable name argument is not a string"); } + if (typeof this.args[0] !== "string") { return this.error("variable name argument is not a string"); } let varName = this.args[0].trim(); - if ("$" !== varName[0] && "_" !== varName[0]) { return this.error('variable name "' + this.args[0] + '" is missing its sigil ($ or _)'); } + if (varName[0] !== "$" && varName[0] !== "_") { return this.error('variable name "' + this.args[0] + '" is missing its sigil ($ or _)'); } Config.debug && this.debugView.modes({ block: true }); @@ -42,12 +42,12 @@ Macro.add("colorinput", { } jQuery(inputElement).attr({ - id: this.name + "-" + r, - name: this.name + "-" + r, - type: 'color', - value: value, - tabindex: 0 - }).addClass("macro-" + this.name) + id: this.name + "-" + r, + name: this.name + "-" + r, + type: 'color', + value: value, + tabindex: 0 + }).addClass("macro-" + this.name) .on("change", function() { State.setVar(varName, this.value); // eslint-disable-next-line eqeqeq diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index 547281a5961..dd088cc835e 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -291,7 +291,7 @@ App.Desc.ageAndHealth = function(slave) { } } - (boy === "girl" ? woman = "woman" : woman = "man"); + woman = (boy === "girl" ? "woman" : "man"); if (!slave.fuckdoll) { if (slave.health < -90) { @@ -660,7 +660,7 @@ App.Desc.waist = function(slave) { let His = capFirstChar(his); /* eslint-enable */ - (boy === "girl" ? woman = "woman" : woman = "man"); + woman = (boy === "girl" ? "woman" : "man"); if (slave.belly >= 1500) { belly = bellyAdjective(slave); } -- GitLab