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

7 years ago · 2f8e89bda8
2 changed files with 5 additions and 5 deletions
--- a/application/src/main/data/json/system/widget_bundles/cards.json
+++ b/application/src/main/data/json/system/widget_bundles/cards.json
--- a/ui/src/app/components/widget/widget.controller.js
+++ b/ui/src/app/components/widget/widget.controller.js
@ -439,13 +439,13 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
    }

    function elementClick(event) {
-        event.stopPropagation();
        var e = event.target || event.srcElement;
        if (e.id) {
            var descriptors = getActionDescriptors('elementClick');
            if (descriptors.length) {
                for (var i = 0; i < descriptors.length; i++) {
                    if (descriptors[i].name == e.id) {
+                        event.stopPropagation();
                        var entityInfo = getActiveEntityInfo();
                        var entityId = entityInfo ? entityInfo.entityId : null;
                        var entityName = entityInfo ? entityInfo.entityName : null;