From c2c7d33d8ec79a2e3fdb4736821e7708b843d658 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Wed, 5 Feb 2014 11:47:04 -0800 Subject: [PATCH] Detail view UI: Fix embedded list view actions Fixes case when detail view has an embedded list view with action, that the action is handled by detail view instead of list view, causing unexpected behavior --- ui/scripts/ui/widgets/detailView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js index 9ca4ddda7a4..4c5aeea6bd6 100644 --- a/ui/scripts/ui/widgets/detailView.js +++ b/ui/scripts/ui/widgets/detailView.js @@ -1486,7 +1486,8 @@ } // Detail action - if ($target.closest('div.detail-view [detail-action], div.detail-view .action.text').size()) { + if ($target.closest('div.detail-view [detail-action], div.detail-view .action.text').size() && + !$target.closest('.list-view').size()) { var $action = $target.closest('.action').find('[detail-action]'); var actionName = $action.attr('detail-action'); var actionCallback = $action.data('detail-view-action-callback');