From 6be2b7bcaa26b879c6ce6f2e1896b5defe70a83c Mon Sep 17 00:00:00 2001 From: Tim Stallard Date: Tue, 4 Apr 2017 14:23:49 +0100 Subject: [PATCH] Fixed element blocks to allow spaces and stuff --- src/blocks/elementsToNumbers.js | 3 ++- src/blocks/numbersToElements.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/blocks/elementsToNumbers.js b/src/blocks/elementsToNumbers.js index 91d715f..8bb4936 100644 --- a/src/blocks/elementsToNumbers.js +++ b/src/blocks/elementsToNumbers.js @@ -12,7 +12,8 @@ module.exports = { execute: function({elements}, elem){ return elements .split(",") - .map((element)=>(require("./util/elements.js").indexOf(element.toLowerCase()) + 1)) + .map((element)=>(element.toLowerCase().replace(/[^a-z]/g, ""))) + .map((element)=>(require("./util/elements.js").indexOf(element) + 1)) .filter((num)=>(num > 0)) .join(","); }, diff --git a/src/blocks/numbersToElements.js b/src/blocks/numbersToElements.js index c9ba375..bd901ae 100644 --- a/src/blocks/numbersToElements.js +++ b/src/blocks/numbersToElements.js @@ -12,6 +12,7 @@ module.exports = { execute: function({numbers}, elem){ return numbers .split(",") + .map((num)=>(num.replace(/[^0-9]/g, ""))) .map((num)=>(parseInt(num))) .filter((num)=>(!isNaN(num))) .map((num)=>(require("./util/elements.js")[num-1]))