X-Git-Url: https://git.yukkurigames.com/?p=string-lerp.git;a=blobdiff_plain;f=string-lerp.js;fp=string-lerp.js;h=bb799a4743e828658c7eef1c3d3d5df8716b981d;hp=8e3ef6417ab7fb846538f5bc57348516fcef9753;hb=bf06839ad7c1952c807da031f82d83e61280bc04;hpb=203ddaf6c8bc3326257cfeeda9a01752fbc7ab5c 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(""); }