[checkmk-commits] Check_MK Git: check_mk: #2618 FIX Fixed "move folder" popup being positioned out of screen on the right

Module: check_mk Branch: master Commit: 44d4557e867ef6c087707708f0e7a8a4177adc07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44d4557e867ef6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 30 16:18:00 2015 +0200 #2618 FIX Fixed "move folder" popup being positioned out of screen on the right --- .werks/2618 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/wato.js | 16 ++++------------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.werks/2618 b/.werks/2618 new file mode 100644 index 0000000..3412d2c --- /dev/null +++ b/.werks/2618 @@ -0,0 +1,9 @@ +Title: Fixed "move folder" popup being positioned out of screen on the right +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1443622653 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ee78898..85d86de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -258,6 +258,7 @@ * 2607 FIX: Fixed broken links from BI views to aggregation group views * 2615 FIX: Fixed bug in legacy dashboard conversion when having users not permitted to access embedded views... * 2429 FIX: check_mk-netapp_api_disk.summary.php: fixed broken php-template + * 2618 FIX: Fixed "move folder" popup being positioned out of screen on the right WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index df7772a..e0748f5 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -772,25 +772,17 @@ function wato_toggle_move_folder(event, oButton) { var id = oButton.id.substr(5); var obj = document.getElementById('move_dialog_' + id); - if(obj) { - if(obj.style.display == 'none') { + if (obj) { + if (obj.style.display == 'none') { obj.style.display = 'block'; + fix_popup_menu_position(event, obj); } else { obj.style.display = 'none'; } obj = null; } - if (event.stopPropagation) - event.stopPropagation(); - event.cancelBubble = true; - - // Disable the default events for all the different browsers - if (event.preventDefault) - event.preventDefault(); - else - event.returnValue = false; - return false; + return prevent_default_events(event); } // .--Host Diag-----------------------------------------------------------.