From 80e35bc4548e36d868f839d721d9e19ac97db58e Mon Sep 17 00:00:00 2001 From: amandaghassaei Date: Tue, 18 Jul 2017 10:30:10 +0600 Subject: [PATCH] remove whitespace from stroke --- js/pattern.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/js/pattern.js b/js/pattern.js index 56f8a46..b97c264 100755 --- a/js/pattern.js +++ b/js/pattern.js @@ -124,20 +124,23 @@ function initPattern(globals){ var stroke = obj.attr("stroke"); if (stroke === undefined) { if (obj.attr("style") && $(obj)[0].style.stroke) { - return ($(obj)[0].style.stroke).toLowerCase(); + stroke = ($(obj)[0].style.stroke).toLowerCase(); + stroke = stroke.replace(/\s/g,'');//remove all whitespace + return stroke; } return null; } + stroke = stroke.replace(/\s/g,'');//remove all whitespace return stroke.toLowerCase(); } function typeForStroke(stroke){ - if (stroke == "#000000" || stroke == "#000" || stroke == "black" || stroke == "rgb(0, 0, 0)") return "border"; - if (stroke == "#ff0000" || stroke == "#f00" || stroke == "red" || stroke == "rgb(255, 0, 0)") return "mountain"; - if (stroke == "#0000ff" || stroke == "#00f" || stroke == "blue" || stroke == "rgb(0, 0, 255)") return "valley"; - if (stroke == "#00ff00" || stroke == "#0f0" || stroke == "green" || stroke == "rgb(0, 255, 0)") return "cut"; - if (stroke == "#ffff00" || stroke == "#ff0" || stroke == "yellow" || stroke == "rgb(255, 255, 0)") return "triangulation"; - if (stroke == "#ff00ff" || stroke == "#f0f" || stroke == "magenta" || stroke == "rgb(255, 0, 255)") return "hinge"; + if (stroke == "#000000" || stroke == "#000" || stroke == "black" || stroke == "rgb(0,0,0)") return "border"; + if (stroke == "#ff0000" || stroke == "#f00" || stroke == "red" || stroke == "rgb(255,0,0)") return "mountain"; + if (stroke == "#0000ff" || stroke == "#00f" || stroke == "blue" || stroke == "rgb(0,0,255)") return "valley"; + if (stroke == "#00ff00" || stroke == "#0f0" || stroke == "green" || stroke == "rgb(0,255,0)") return "cut"; + if (stroke == "#ffff00" || stroke == "#ff0" || stroke == "yellow" || stroke == "rgb(255,255,0)") return "triangulation"; + if (stroke == "#ff00ff" || stroke == "#f0f" || stroke == "magenta" || stroke == "rgb(255,0,255)") return "hinge"; badColors.push(stroke); return null; } -- GitLab