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

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Igor Kulikov 2019-08-16 12:25:30 +03:00
commit 2f8e89bda8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/src/main/data/json/system/widget_bundles/cards.json
View File

File diff suppressed because one or more lines are too long

2
ui/src/app/components/widget/widget.controller.js
View File

@ -439,13 +439,13 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
} }
function elementClick(event) { function elementClick(event) {
event.stopPropagation();
var e = event.target || event.srcElement; var e = event.target || event.srcElement;
if (e.id) { if (e.id) {
var descriptors = getActionDescriptors('elementClick'); var descriptors = getActionDescriptors('elementClick');
if (descriptors.length) { if (descriptors.length) {
for (var i = 0; i < descriptors.length; i++) { for (var i = 0; i < descriptors.length; i++) {
if (descriptors[i].name == e.id) { if (descriptors[i].name == e.id) {
event.stopPropagation();
var entityInfo = getActiveEntityInfo(); var entityInfo = getActiveEntityInfo();
var entityId = entityInfo ? entityInfo.entityId : null; var entityId = entityInfo ? entityInfo.entityId : null;
var entityName = entityInfo ? entityInfo.entityName : null; var entityName = entityInfo ? entityInfo.entityName : null;