Fix trailing character bug.

firstopinion · ff4d23b91a7e0d35ab59f4a66dd8719a1b5082e3 · mickeyreiss committed Mar 17, 2014 · Mar 17, 2014 · ff4d23b
1 parent 8ce0d48
commit ff4d23b91a7e0d35ab59f4a66dd8719a1b5082e3
Unified Split

Showing with 38 additions and 8 deletions.

+2 −1 lib/formatter.js

+1 −1 lib/formatter.min.js

+2 −1 lib/jquery.formatter.js

+1 −1 lib/jquery.formatter.min.js

+2 −2 src/pattern.js

+30 −2 test/pattern.js
diff --git a/lib/formatter.js b/lib/formatter.js
@@ -511,7 +511,7 @@ pattern.parse = function (pattern) {
 
   // Process match or add chars
   for (i; i < pLength; i++) {
-    if (i == matches[mCount].index) {
+    if (mCount < matches.length && i == matches[mCount].index) {
       processMatch(matches[mCount][1]);
     } else {
       info.chars[i - (mCount * DELIM_SIZE)] = pattern.charAt(i);
@@ -522,6 +522,7 @@ pattern.parse = function (pattern) {
   info.mLength = i - (mCount * DELIM_SIZE);
   return info;
 };
+
 //
 // Parse a matcher string into a RegExp. Accepts valid regular
 // expressions and the catchall '*'.
diff --git a/lib/formatter.min.js b/lib/formatter.min.js
diff --git a/lib/jquery.formatter.js b/lib/jquery.formatter.js
@@ -507,7 +507,7 @@ pattern.parse = function (pattern) {
 
   // Process match or add chars
   for (i; i < pLength; i++) {
-    if (i == matches[mCount].index) {
+    if (mCount < matches.length && i == matches[mCount].index) {
       processMatch(matches[mCount][1]);
     } else {
       info.chars[i - (mCount * DELIM_SIZE)] = pattern.charAt(i);
@@ -518,6 +518,7 @@ pattern.parse = function (pattern) {
   info.mLength = i - (mCount * DELIM_SIZE);
   return info;
 };
+
 //
 // Parse a matcher string into a RegExp. Accepts valid regular
 // expressions and the catchall '*'.