Author: Lars Michelsen <[email protected]>
Date: Sat Sep 3 00:20:05 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sat Sep 3 00:20:05 2011 +0200
Bugfix: Fixed hanging controls/labels when dragging objects out of screen
---
ChangeLog | 1 +
share/frontend/nagvis-js/js/edit.js | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b976b76..86f3b2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ Frontend
on slower clients
* Bugfix: Fixed javascript error "Error: attempt to run compile-and-go
script on a cleared scope"
after changed main configuration file in FF4
+ * Bugfix: Fixed hanging controls/labels when dragging objects out of screen
Automap
* Bugfix: Made the problem automap work again
diff --git a/share/frontend/nagvis-js/js/edit.js
b/share/frontend/nagvis-js/js/edit.js
index 09271a8..84eb78e 100644
--- a/share/frontend/nagvis-js/js/edit.js
+++ b/share/frontend/nagvis-js/js/edit.js
@@ -228,7 +228,7 @@ function dragObject(event) {
}
}
- // Call the dragging handler when one is ste
+ // Call the dragging handler when one is set
if(dragObjectHandler)
dragObjectHandler(draggingObject);
oParent = null;
@@ -271,7 +271,7 @@ function moveRelativeObject(parentId, parentTop,
parentLeft) {
if(typeof dragObjectChilds[sLabelName] !== 'undefined') {
var oLabel = document.getElementById(sLabelName);
if(oLabel) {
- oLabel.style.position = 'absolute';
+ oLabel.style.position = 'absolute';
oLabel.style.top = (dragObjectChilds[sLabelName][0] + parentTop)
+ 'px';
oLabel.style.left = (dragObjectChilds[sLabelName][1] + parentLeft)
+ 'px';
oLabel = null;
@@ -289,7 +289,15 @@ function dragStop(event) {
if(draggingObject.y < 0 || draggingObject.x < 0) {
draggingObject.style.top = dragObjectStartPos[0] + 'px';
draggingObject.style.left = dragObjectStartPos[1] + 'px';
- moveRelativeObject(draggingObject.id, dragObjectStartPos[0],
dragObjectStartPos[1])
+ draggingObject.x = dragObjectStartPos[1];
+ draggingObject.y = dragObjectStartPos[0];
+
+ moveRelativeObject(draggingObject.id, dragObjectStartPos[0],
dragObjectStartPos[1]);
+
+ // Call the dragging handler when one is set
+ if(dragObjectHandler)
+ dragObjectHandler(draggingObject);
+
draggingObject = null;
return;
}
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
