Module: nagvis Branch: master Commit: 82db9632f16a80bc467c0ee90631f6910a170b9f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=82db9632f16a80bc467c0ee90631f6910a170b9f
Author: Lars Michelsen <[email protected]> Date: Wed Sep 1 13:34:25 2010 +0200 The WUI popup windows are opened in the visible area of the browser everytime now --- share/frontend/nagvis-js/js/nagvis.js | 39 +++++++++++++++------------- share/frontend/nagvis-js/js/popupWindow.js | 4 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/share/frontend/nagvis-js/js/nagvis.js b/share/frontend/nagvis-js/js/nagvis.js index 2d5d122..ffe5364 100644 --- a/share/frontend/nagvis-js/js/nagvis.js +++ b/share/frontend/nagvis-js/js/nagvis.js @@ -556,14 +556,33 @@ function pageHeight() { return h; } +function getScrollTop() { + if (typeof window.pageYOffset !== 'undefined') + return window.pageYOffset; + else if (typeof document.compatMode !== 'undefined' && document.compatMode !== 'BackCompat') + return document.documentElement.scrollTop; + else if (typeof document.body !== 'undefined') + return document.body.scrollTop; +} + +function getScrollLeft() { + if (typeof window.pageXOffset !== 'undefined') + return window.pageXOffset; + else if (typeof document.compatMode != 'undefined' && document.compatMode !== 'BackCompat') + return document.documentElement.scrollLeft; + else if (typeof document.body !== 'undefined') + return document.body.scrollLeft; +} + + /** * Scrolls the screen to the defined coordinates * * @author Lars Michelsen <[email protected]> */ function scrollSlow(iTargetX, iTargetY, iSpeed) { - var currentScrollTop; - var currentScrollLeft; + var currentScrollTop = getScrollTop(); + var currentScrollLeft = getScrollLeft(); var iMapOffsetTop; var scrollTop; var scrollLeft; @@ -572,22 +591,6 @@ function scrollSlow(iTargetX, iTargetY, iSpeed) { var iStep = 2; - if (typeof window.pageYOffset !== 'undefined') { - currentScrollTop = window.pageYOffset; - } else if (typeof document.compatMode !== 'undefined' && document.compatMode !== 'BackCompat') { - currentScrollTop = document.documentElement.scrollTop; - } else if (typeof document.body !== 'undefined') { - currentScrollTop = document.body.scrollTop; - } - - if (typeof window.pageXOffset !== 'undefined') { - currentScrollLeft = window.pageXOffset; - } else if (typeof document.compatMode != 'undefined' && document.compatMode !== 'BackCompat') { - currentScrollLeft = document.documentElement.scrollLeft; - } else if (typeof document.body !== 'undefined') { - currentScrollLeft = document.body.scrollLeft; - } - // Get offset of the map div var oMap = document.getElementById('map'); if(oMap && oMap.offsetTop) { diff --git a/share/frontend/nagvis-js/js/popupWindow.js b/share/frontend/nagvis-js/js/popupWindow.js index 0362851..c04df2c 100644 --- a/share/frontend/nagvis-js/js/popupWindow.js +++ b/share/frontend/nagvis-js/js/popupWindow.js @@ -156,8 +156,8 @@ function popupWindow(title, oContent, openOnMousePosition, sWidth) { popupWindowClose(); // Default window position - var posX = 100; - var posY = 20; + var posX = getScrollLeft() + 100; + var posY = getScrollTop() + 20; // Detect the current mouse position and create the window there if(openOnMousePosition) { ------------------------------------------------------------------------------ This SF.net Dev2Dev email is sponsored by: Show off your parallel programming skills. Enter the Intel(R) Threading Challenge 2010. http://p.sf.net/sfu/intel-thread-sfd _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
