From 3cbad38c79e1213634cf35a2c1fc1d4872178953 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 13 Dec 2013 09:22:15 +0000 Subject: [PATCH] 2013-12-13 Sergio Martin * include/graphs/flot/pandora.flot.js: Fixed wrong condition of minimum height of menu. Incident #417 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9221 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/include/graphs/flot/pandora.flot.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0f7389d7b5..6b1245c749 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-12-13 Sergio Martin + + * include/graphs/flot/pandora.flot.js: Fixed wrong + condition of minimum height of menu. + Incident #417 + 2013-12-13 Sergio Martin * include/javascript/pandora.js: Added auto scroll diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 49507218ae..3a50fb11f8 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1048,7 +1048,7 @@ function adjust_menu(graph_id, plot, parent_height) { var menu_height = '25'; - if($('#menu_'+graph_id).height() != undefined || $('#menu_'+graph_id).height() < 20) { + if($('#menu_'+graph_id).height() != undefined && $('#menu_'+graph_id).height() > 20) { menu_height = $('#menu_'+graph_id).height(); }