Merge pull request #337 from ghiscoding/bugfix/firefox-throw-regex-error

ghiscoding · web-flow · commit c6662dd1450b · 2019-11-12T09:49:22.000-05:00
fix(firefox): thousand separator regex lookbehind not allow, fixes #336
diff --git a/src/app/modules/angular-slickgrid/services/utilities.ts b/src/app/modules/angular-slickgrid/services/utilities.ts
@@ -614,7 +614,11 @@ export function setDeepValue(obj: any, path: string | string[], value: any) {
 export function thousandSeparatorFormatted(inputValue: string | number | null, separator: ',' | '_' | '.' | ' ' | '' = ','): string | null {
   if (inputValue !== null && inputValue !== undefined) {
     const stringValue = `${inputValue}`;
-    return stringValue.replace(/(?<!\.\d+)\B(?=(\d{3})+\b)/g, separator);
+    const decimalSplit = stringValue.split('.');
+    if (decimalSplit.length === 2) {
+      return `${decimalSplit[0].replace(/\B(?=(\d{3})+(?!\d))/g, separator)}.${decimalSplit[1]}`;
+    }
+    return stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, separator);
   }
   return inputValue as null;
 }

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,11 @@ export function setDeepValue(obj: any, path: string \| string[], value: any) {`
`614`	`614`	`export function thousandSeparatorFormatted(inputValue: string \| number \| null, separator: ',' \| '_' \| '.' \| ' ' \| '' = ','): string \| null {`
`615`	`615`	`if (inputValue !== null && inputValue !== undefined) {`
`616`	`616`	const stringValue = `${inputValue}`;
`617`		`- return stringValue.replace(/(?<!\.\d+)\B(?=(\d{3})+\b)/g, separator);`
	`617`	`+ const decimalSplit = stringValue.split('.');`
	`618`	`+ if (decimalSplit.length === 2) {`
	`619`	+ return `${decimalSplit[0].replace(/\B(?=(\d{3})+(?!\d))/g, separator)}.${decimalSplit[1]}`;
	`620`	`+ }`
	`621`	`+ return stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, separator);`
`618`	`622`	`}`
`619`	`623`	`return inputValue as null;`
`620`	`624`	`}`