_typeof to typeof + cleaning

src/js/colorinput.js

@@ -2,7 +2,7 @@ Macro.add("colorinput", {
 	handler: function() {
 		if (this.args.length < 2) {
 			var 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")
+			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");
 		var varName = this.args[0].trim();
@@ -20,7 +20,7 @@ Macro.add("colorinput", {
 		} else if (this.args.length > 2) {
 			passage = this.args[2];
 		}
-		if (passage !== (void 0) && _typeof(passage) === "object") {
+		if (passage !== (void 0) && typeof(passage) === "object") {
 			passage = passage.link;
 		}
 		if (!passage) {
@@ -48,12 +48,12 @@ Macro.add("colorinput", {
 			value: value,
 			tabindex: 0
 		}).addClass("macro-" + this.name)
-		.on("change", function() {
-			State.setVar(varName, this.value);
-			if (this.value != value) { // If the value has actually changed, reload the page.  Note != and not !== because types might be different
-				gotoPassage();
-			}
-		})
-		.appendTo(this.output);
+			.on("change", function() {
+				State.setVar(varName, this.value);
+				if (this.value != value) { // If the value has actually changed, reload the page.  Note != and not !== because types might be different
+					gotoPassage();
+				}
+			})
+			.appendTo(this.output);
 	}
-})
+});