From bf06839ad7c1952c807da031f82d83e61280bc04 Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Mon, 19 May 2014 10:44:51 +0200 Subject: [PATCH] No reason to split into sourceParts, use the regex to extract matches directly. --- string-lerp.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/string-lerp.js b/string-lerp.js index 8e3ef64..bb799a4 100644 --- a/string-lerp.js +++ b/string-lerp.js @@ -195,11 +195,11 @@ numerals gives undefined results. */ - var sourceParts = source.split(NUMBERS); var targetParts = target.split(NUMBERS); - var destParts = targetParts; - for (var i = 1; i < sourceParts.length; i += 2) { - var sourcePart = sourceParts[i]; + var match; + var i = 1; + while ((match = NUMBERS.exec(source))) { + var sourcePart = match[0]; var targetPart = targetParts[i]; var part = nlerp(+sourcePart, +targetPart, amount); var sourcePoint = sourcePart.indexOf("."); @@ -209,6 +209,7 @@ targetPoint >= 0 ? (targetPart.length - 1) - targetPoint : 0, amount)); targetParts[i] = part.toFixed(point); + i += 2; } return targetParts.join(""); } -- 2.20.1