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

Minor fixes

Browse Source
This commit is contained in:
Igor Kulikov 2020-05-05 13:46:26 +03:00
parent 9953853f71
commit f7efb79015
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
application/src/main/data/json/system/widget_bundles/gpio_widgets.json
View File

File diff suppressed because one or more lines are too long

8
msa/js-executor/package-lock.json generated
View File

@ -1944,14 +1944,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -1971,8 +1969,7 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
@ -2120,7 +2117,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }

6
ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts
View File

@ -109,8 +109,10 @@ export function aspectCache(imageUrl: string): Observable<number> {
} }
} }
export type TranslateFunc = (key: string, defaultTranslation?: string) => string;
function parseTemplate(template: string, data: { $datasource?: Datasource, [key: string]: any }, function parseTemplate(template: string, data: { $datasource?: Datasource, [key: string]: any },
translateFn?: (key: string) => string) { translateFn?: TranslateFunc) {
let res = ''; let res = '';
try { try {
if (template.match(/<link-act/g)) { if (template.match(/<link-act/g)) {
@ -146,8 +148,6 @@ function parseTemplate(template: string, data: { $datasource?: Datasource, [key:
return res; return res;
} }
type TranslateFunc = (key: string, defaultTranslation?: string) => string;
export const parseWithTranslation = { export const parseWithTranslation = {
translateFn: null, translateFn: null,