dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IE11 fixes

Browse Source
This commit is contained in:
Igor Kulikov 2020-04-24 18:36:46 +03:00
parent 916579cf05
commit 99ef1cba28
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/package-lock.json generated
View File

@ -7730,9 +7730,9 @@
"integrity": "sha1-RGf0n5jRv9VpWb2cZwUgPdJgEnc=" "integrity": "sha1-RGf0n5jRv9VpWb2cZwUgPdJgEnc="
}, },
"leaflet.gridlayer.googlemutant": { "leaflet.gridlayer.googlemutant": {
"version": "0.9.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.9.0.tgz", "resolved": "https://registry.npmjs.org/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.8.0.tgz",
"integrity": "sha512-hkLEHLcdcCaq1OKgUla5ar6fCaUK6yBYIY9HyAclPcMwhnpJTnLmYYPbVJbq3Niz0YiO75gls4A6D6jkBJXpuw==" "integrity": "sha512-Ain+jgDKRhlM6qNDDj2QFJa9vXUqV096N0PmpHO3DoNLS4I7EynTQCJXN+9qY4C51ZpV4Q4CI+apNv5XiP5aUA=="
}, },
"leaflet.markercluster": { "leaflet.markercluster": {
"version": "1.4.1", "version": "1.4.1",

2
ui-ngx/package.json
View File

@ -61,7 +61,7 @@
"leaflet-geometryutil": "^0.9.3", "leaflet-geometryutil": "^0.9.3",
"leaflet-polylinedecorator": "^1.6.0", "leaflet-polylinedecorator": "^1.6.0",
"leaflet-providers": "^1.9.1", "leaflet-providers": "^1.9.1",
"leaflet.gridlayer.googlemutant": "^0.9.0", "leaflet.gridlayer.googlemutant": "^0.8.0",
"leaflet.markercluster": "^1.4.1", "leaflet.markercluster": "^1.4.1",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"messageformat": "^2.3.0", "messageformat": "^2.3.0",

4
ui-ngx/src/app/core/utils.ts
View File

@ -539,7 +539,9 @@ export function parseTemplate(template: string, data: object, translateFn?: (key
} }
const expressions = template.match(/\{(.*?)\}/g); const expressions = template.match(/\{(.*?)\}/g);
if (expressions) { if (expressions) {
const clearMatches = template.match(/(?<=\{)(.+?)(?=(\}|\:))/g); // TODO: not supported in IE
// const clearMatches = template.match(/(?<=\{)(.+?)(?=(\}|\:))/g);
const clearMatches = template.match(/\{(.+?)(\}|\:)/g);
for (const key in data) { for (const key in data) {
if (!key.includes('|')) if (!key.includes('|'))
variables += `let ${key} = '${clearMatches[key] ? padValue(data[key], +clearMatches[key]) : data[key]}';`; variables += `let ${key} = '${clearMatches[key] ? padValue(data[key], +clearMatches[key]) : data[key]}';`;

2
ui-ngx/src/browserslist
View File

@ -8,4 +8,4 @@
last 2 versions last 2 versions
Firefox ESR Firefox ESR
not dead not dead
not IE 9-11 IE 10-11