From aa49c338f459926f99c2f02187b1d02e5231be28 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 31 Jan 2013 17:40:56 +0000 Subject: [PATCH] 2013-01-31 Miguel de Dios * godmode/reporting/visual_console_builder.editor.js: fixed a fucking infinite loop thanks javascript for hidden threads. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7555 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 ++++++- .../godmode/reporting/visual_console_builder.editor.js | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c75854e702..371cf5c13e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-01-31 Miguel de Dios + + * godmode/reporting/visual_console_builder.editor.js: fixed a + fucking infinite loop thanks javascript for hidden threads. + 2013-01-31 Miguel de Dios * include/styles/jquery-ui-1.10.0.custom.css, @@ -5,7 +10,7 @@ include/javascript/jquery.jquery-ui-1.10.0.custom.js, include/javascript/jquery-1.9.0.js: added the last version of jquery and jqueryUI. - + * godmode/reporting/visual_console_builder.editor.js, include/ajax/events.php, include/functions_events.php, include/functions_reporting.php, diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index fa31918e53..3a8b37084a 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -1521,7 +1521,7 @@ function eventsItems(drag) { $('.item').bind('click', function(event, ui) { event.stopPropagation(); if (!is_opened_palette) { - divParent = $(event.target).parent(); + var divParent = $(event.target); while (!$(divParent).hasClass("item")) { divParent = $(divParent).parent(); } @@ -1976,7 +1976,7 @@ function showGrid() { eventsItems([SIZE_GRID, SIZE_GRID]); } - else{ + else { $("#background_grid").css('display', 'none'); $("#background_img").css('opacity', '1'); $("#background_img").css('filter', 'alpha(opacity=100)');