Commit 0665e6d0 by Samuel Padgett

Don't trigger tile-click target if user clicks a button inside the tile

parent 4e6c2e4b
...@@ -885,8 +885,9 @@ angular.module('openshiftCommonUI') ...@@ -885,8 +885,9 @@ angular.module('openshiftCommonUI')
restrict: 'AC', restrict: 'AC',
link: function($scope, element) { link: function($scope, element) {
$(element).click(function (evt) { $(element).click(function (evt) {
// Don't trigger tile target if the user clicked directly on a link or button inside the tile.
var t = $(evt.target); var t = $(evt.target);
if (t && t.closest("a", element).length) { if (t && (t.closest("a", element).length || t.closest("button", element).length)) {
return; return;
} }
$('a.tile-target', element).trigger("click"); $('a.tile-target', element).trigger("click");
......
...@@ -1056,8 +1056,9 @@ angular.module('openshiftCommonUI') ...@@ -1056,8 +1056,9 @@ angular.module('openshiftCommonUI')
restrict: 'AC', restrict: 'AC',
link: function($scope, element) { link: function($scope, element) {
$(element).click(function (evt) { $(element).click(function (evt) {
// Don't trigger tile target if the user clicked directly on a link or button inside the tile.
var t = $(evt.target); var t = $(evt.target);
if (t && t.closest("a", element).length) { if (t && (t.closest("a", element).length || t.closest("button", element).length)) {
return; return;
} }
$('a.tile-target', element).trigger("click"); $('a.tile-target', element).trigger("click");
......
...@@ -339,7 +339,7 @@ restrict:"AC", ...@@ -339,7 +339,7 @@ restrict:"AC",
link:function($scope, element) { link:function($scope, element) {
$(element).click(function(evt) { $(element).click(function(evt) {
var t = $(evt.target); var t = $(evt.target);
t && t.closest("a", element).length || $("a.tile-target", element).trigger("click"); t && (t.closest("a", element).length || t.closest("button", element).length) || $("a.tile-target", element).trigger("click");
}); });
} }
}; };
......
...@@ -6,8 +6,9 @@ angular.module('openshiftCommonUI') ...@@ -6,8 +6,9 @@ angular.module('openshiftCommonUI')
restrict: 'AC', restrict: 'AC',
link: function($scope, element) { link: function($scope, element) {
$(element).click(function (evt) { $(element).click(function (evt) {
// Don't trigger tile target if the user clicked directly on a link or button inside the tile.
var t = $(evt.target); var t = $(evt.target);
if (t && t.closest("a", element).length) { if (t && (t.closest("a", element).length || t.closest("button", element).length)) {
return; return;
} }
$('a.tile-target', element).trigger("click"); $('a.tile-target', element).trigger("click");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment