Showing
4 changed files
with
8 additions
and
6 deletions
| @@ -7730,9 +7730,9 @@ | @@ -7730,9 +7730,9 @@ | ||
| 7730 | "integrity": "sha1-RGf0n5jRv9VpWb2cZwUgPdJgEnc=" | 7730 | "integrity": "sha1-RGf0n5jRv9VpWb2cZwUgPdJgEnc=" |
| 7731 | }, | 7731 | }, |
| 7732 | "leaflet.gridlayer.googlemutant": { | 7732 | "leaflet.gridlayer.googlemutant": { |
| 7733 | - "version": "0.9.0", | ||
| 7734 | - "resolved": "https://registry.npmjs.org/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.9.0.tgz", | ||
| 7735 | - "integrity": "sha512-hkLEHLcdcCaq1OKgUla5ar6fCaUK6yBYIY9HyAclPcMwhnpJTnLmYYPbVJbq3Niz0YiO75gls4A6D6jkBJXpuw==" | 7733 | + "version": "0.8.0", |
| 7734 | + "resolved": "https://registry.npmjs.org/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.8.0.tgz", | ||
| 7735 | + "integrity": "sha512-Ain+jgDKRhlM6qNDDj2QFJa9vXUqV096N0PmpHO3DoNLS4I7EynTQCJXN+9qY4C51ZpV4Q4CI+apNv5XiP5aUA==" | ||
| 7736 | }, | 7736 | }, |
| 7737 | "leaflet.markercluster": { | 7737 | "leaflet.markercluster": { |
| 7738 | "version": "1.4.1", | 7738 | "version": "1.4.1", |
| @@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
| 61 | "leaflet-geometryutil": "^0.9.3", | 61 | "leaflet-geometryutil": "^0.9.3", |
| 62 | "leaflet-polylinedecorator": "^1.6.0", | 62 | "leaflet-polylinedecorator": "^1.6.0", |
| 63 | "leaflet-providers": "^1.9.1", | 63 | "leaflet-providers": "^1.9.1", |
| 64 | - "leaflet.gridlayer.googlemutant": "^0.9.0", | 64 | + "leaflet.gridlayer.googlemutant": "^0.8.0", |
| 65 | "leaflet.markercluster": "^1.4.1", | 65 | "leaflet.markercluster": "^1.4.1", |
| 66 | "material-design-icons": "^3.0.1", | 66 | "material-design-icons": "^3.0.1", |
| 67 | "messageformat": "^2.3.0", | 67 | "messageformat": "^2.3.0", |
| @@ -539,7 +539,9 @@ export function parseTemplate(template: string, data: object, translateFn?: (key | @@ -539,7 +539,9 @@ export function parseTemplate(template: string, data: object, translateFn?: (key | ||
| 539 | } | 539 | } |
| 540 | const expressions = template.match(/\{(.*?)\}/g); | 540 | const expressions = template.match(/\{(.*?)\}/g); |
| 541 | if (expressions) { | 541 | if (expressions) { |
| 542 | - const clearMatches = template.match(/(?<=\{)(.+?)(?=(\}|\:))/g); | 542 | + // TODO: not supported in IE |
| 543 | + // const clearMatches = template.match(/(?<=\{)(.+?)(?=(\}|\:))/g); | ||
| 544 | + const clearMatches = template.match(/\{(.+?)(\}|\:)/g); | ||
| 543 | for (const key in data) { | 545 | for (const key in data) { |
| 544 | if (!key.includes('|')) | 546 | if (!key.includes('|')) |
| 545 | variables += `let ${key} = '${clearMatches[key] ? padValue(data[key], +clearMatches[key]) : data[key]}';`; | 547 | variables += `let ${key} = '${clearMatches[key] ? padValue(data[key], +clearMatches[key]) : data[key]}';`; |