From f8540d079c43d1e832c586326eaafca62912af6c Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 6 Mar 2014 09:42:29 +0000 Subject: [PATCH] Relax hardcoded link target detection, more TBD --- public/js/icinga/events.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 9d2c698fa..4dabd9209 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -186,6 +186,7 @@ var $a = $(this); var href = $a.attr('href'); var $li; + var targetId; if ($a.attr('target') === '_blank') { return true; } @@ -207,13 +208,16 @@ $target = $container; } - if ($a.closest('table').length) { + if ($a.closest('table.action').length) { $target = $('#col2'); icinga.events.layout2col(); } if ($a.closest('[data-base-target]').length) { - $target = $('#' + $a.closest('[data-base-target]').data('baseTarget')); - icinga.events.layout2col(); + targetId = $a.closest('[data-base-target]').data('baseTarget'); + $target = $('#' + targetId); + if (targetId === 'col2') { + icinga.events.layout2col(); + } } if ($a.closest('.tree').length) { $li = $a.closest('li');