Author: Lars Michelsen <[email protected]>
Date: Fri Jan 13 18:26:01 2012 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Fri Jan 13 18:26:01 2012 +0100
Bugfix: Fixed problem with the hover menu when using the hover_delay parameter;
Added some hover debug code
---
ChangeLog | 1 +
share/frontend/nagvis-js/js/NagVisObject.js | 10 +++++++++-
share/frontend/nagvis-js/js/hover.js | 13 +++++++++----
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f7ac9b7..d5be622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ Frontend
no target object can be found
* Bugfix: Fixed file upload input field styling issues (at least in Firefox)
* Bugfix: Removed backendtype fields from "Manage Backends" dialog forms
+ * Bugfix: Fixed problem with the hover menu when using the hover_delay
parameter
Automap
* Bugfix: Added missing view_type=line parameter to automap exported maps
diff --git a/share/frontend/nagvis-js/js/NagVisObject.js
b/share/frontend/nagvis-js/js/NagVisObject.js
index da8fc3a..fd6b6ff 100644
--- a/share/frontend/nagvis-js/js/NagVisObject.js
+++ b/share/frontend/nagvis-js/js/NagVisObject.js
@@ -399,7 +399,15 @@ var NagVisObject = Base.extend({
// Add eventhandlers for hover menu
if(oObj) {
- oObj.onmousemove = function(e) { var id = objId; var iH =
iHoverDelay; displayHoverMenu(e, id, iH); id = null; iH = null; };
+ oObj.onmousemove = function(event) {
+ // IE is evil and doesn't pass the event object
+ if(!isset(event))
+ event = window.event;
+ var id = objId;
+ var iH = iHoverDelay;
+ displayHoverMenu(event, id, iH);
+ id = null; iH = null; event = null;
+ };
oObj.onmouseout = function(e) { var id = objId; hoverHide(id);
id = null; };
}
diff --git a/share/frontend/nagvis-js/js/hover.js
b/share/frontend/nagvis-js/js/hover.js
index 8c757bf..469cac0 100644
--- a/share/frontend/nagvis-js/js/hover.js
+++ b/share/frontend/nagvis-js/js/hover.js
@@ -322,16 +322,21 @@ function replaceHoverTemplateStaticMacros(oObj,
sTemplateCode) {
}
function displayHoverMenu(event, objId, iHoverDelay) {
- // IE is evil and doesn't pass the event object
- if(!isset(event))
- event = window.event;
+ if(!event) {
+ alert('ERROR: The event object is not defined.');
+ return;
+ }
+ if(!objId) {
+ alert('ERROR: The object id is not defined.');
+ return;
+ }
// Only show up hover menu when no context menu is opened
// and only handle the events when no timer is in schedule at the moment to
// prevent strange movement effects when the timer has finished
if(!dragging() && !contextOpen() && _hoverTimer === null) {
if(iHoverDelay && iHoverDelay != "0" && !hoverOpen())
- _hoverTimer = setTimeout('hoverShow('+event.clientX+',
'+event.clientY+', '+objId+')', parseInt(iHoverDelay)*1000);
+ _hoverTimer = setTimeout('hoverShow('+event.clientX+',
'+event.clientY+', "'+objId+'")', parseInt(iHoverDelay)*1000);
else
hoverShow(event.clientX, event.clientY, objId);
}
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
