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

wip on ie 11 fixes

Browse Source
This commit is contained in:
Adsumus 2020-04-26 19:44:59 +03:00
parent 9e866b68e8
commit 3fe468b276
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5073,8 +5073,7 @@
"es6-promise": { "es6-promise": {
"version": "4.2.8", "version": "4.2.8",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
"integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
"dev": true
}, },
"es6-promisify": { "es6-promisify": {
"version": "5.0.0", "version": "5.0.0",
@ -10399,6 +10398,11 @@
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
"dev": true "dev": true
}, },
"promise-polyfill": {
"version": "8.1.3",
"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz",
"integrity": "sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g=="
},
"promise-retry": { "promise-retry": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",

2
ui-ngx/package.json
View File

@ -47,6 +47,7 @@
"compass-sass-mixins": "^0.12.7", "compass-sass-mixins": "^0.12.7",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"date-fns": "^2.12.0", "date-fns": "^2.12.0",
"es6-promise": "^4.2.8",
"flot": "git://github.com/thingsboard/flot.git#0.9-work", "flot": "git://github.com/thingsboard/flot.git#0.9-work",
"flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master", "flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
@ -73,6 +74,7 @@
"ngx-hm-carousel": "^2.0.0-rc.1", "ngx-hm-carousel": "^2.0.0-rc.1",
"ngx-translate-messageformat-compiler": "^4.6.0", "ngx-translate-messageformat-compiler": "^4.6.0",
"objectpath": "^2.0.0", "objectpath": "^2.0.0",
"promise-polyfill": "8.1.3",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"raphael": "^2.3.0", "raphael": "^2.3.0",
"rc-select": "^10.2.4", "rc-select": "^10.2.4",

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

@ -539,7 +539,7 @@ 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); 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]}';`;

1
ui-ngx/src/polyfills.ts
View File

@ -75,6 +75,7 @@
import './zone-flags'; import './zone-flags';
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'core-js/es/array'; import 'core-js/es/array';
import { polyfill } from 'es6-promise'; polyfill();
import moment from 'moment'; import moment from 'moment';
/*************************************************************************************************** /***************************************************************************************************