Merge branch 'master' into develop

This commit is contained in:
Torkel Ödegaard
2017-10-12 16:32:44 +02:00
41 changed files with 691 additions and 191 deletions

View File

@@ -358,6 +358,8 @@
// Remove icon clicked
self.$container.on('click', '[data-role=remove]', $.proxy(function(event) {
self.remove($(event.target).closest('.tag').data('item'));
// Grafana mod, if tags input used in popover the click event will bubble up and hide popover
event.stopPropagation();
}, self));
// Only add existing value as tags when using strings as tags