Author: Lars Michelsen <[email protected]>
Date: Tue Apr 26 18:22:30 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Apr 26 18:22:30 2011 +0200
Fixed several IE problems
---
share/frontend/nagvis-js/js/edit.js | 23 +++++++++++++++++------
share/frontend/nagvis-js/js/frontend.js | 8 +++++++-
share/userfiles/templates/default.context.html | 6 +++---
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/share/frontend/nagvis-js/js/edit.js
b/share/frontend/nagvis-js/js/edit.js
index bae0ce7..e7a8793 100644
--- a/share/frontend/nagvis-js/js/edit.js
+++ b/share/frontend/nagvis-js/js/edit.js
@@ -28,8 +28,14 @@
/**
* Changes the handling of the line middle for lines with two parts
*/
-function toggleLineMidLock(objectId) {
- getMapObjByDomObjId(objectId).toggleLineMidLock();
+function toggleLineMidLock(event, objectId) {
+ getMapObjByDomObjId(objectId).toggleLineMidLock();
+
+ var event = !event ? window.event : event;
+ if(event.stopPropagation)
+ event.stopPropagation();
+ event.cancelBubble = true;
+ return false;
}
/**
@@ -37,8 +43,14 @@ function toggleLineMidLock(objectId) {
*
* @author Lars Michelsen <[email protected]>
*/
-function toggleMapObjectLock(objectId) {
- updateNumUnlocked(getMapObjByDomObjId(objectId).toggleLock());
+function toggleMapObjectLock(event, objectId) {
+ updateNumUnlocked(getMapObjByDomObjId(objectId).toggleLock());
+
+ var event = !event ? window.event : event;
+ if(event.stopPropagation)
+ event.stopPropagation();
+ event.cancelBubble = true;
+ return false;
}
/**
@@ -317,8 +329,6 @@ var addObjType = null,
* Is called once to start the object creation
*/
function addObject(e, objType, viewType, numLeft, action) {
- var event = !e ? window.event : e;
-
addObjType = objType;
addViewType = viewType;
addNumLeft = numLeft;
@@ -327,6 +337,7 @@ function addObject(e, objType, viewType, numLeft, action) {
if(document.body)
document.body.style.cursor = 'crosshair';
+ var event = !e ? window.event : e;
if(event.stopPropagation)
event.stopPropagation();
event.cancelBubble = true;
diff --git a/share/frontend/nagvis-js/js/frontend.js
b/share/frontend/nagvis-js/js/frontend.js
index 3b2fd04..3857eea 100644
--- a/share/frontend/nagvis-js/js/frontend.js
+++ b/share/frontend/nagvis-js/js/frontend.js
@@ -863,7 +863,7 @@ function removeMapObject(objectId) {
*
* @author Lars Michelsen <[email protected]>
*/
-function refreshMapObject(objectId) {
+function refreshMapObject(event, objectId) {
var oObj = getMapObjByDomObjId(objectId);
var name = oObj.conf.name;
@@ -912,6 +912,12 @@ function refreshMapObject(objectId) {
if(oPageProperties.view_type !== 'overview' && bStateChanged)
updateMapBasics();
bStateChanged = null;
+
+ var event = !event ? window.event : event;
+ if(event.stopPropagation)
+ event.stopPropagation();
+ event.cancelBubble = true;
+ return false
}
diff --git a/share/userfiles/templates/default.context.html
b/share/userfiles/templates/default.context.html
index cd43947..df6aec3 100644
--- a/share/userfiles/templates/default.context.html
+++ b/share/userfiles/templates/default.context.html
@@ -1,10 +1,10 @@
<ul>
- <li><a href="#" onClick="refreshMapObject('[obj_id]');
contextHide();">[lang_refresh_status]</a></li>
+ <li><a href="#" onClick="refreshMapObject(event, '[obj_id]');
contextHide();return false">[lang_refresh_status]</a></li>
<!-- BEGIN not_automap -->
- <li><a href="#" onClick="toggleMapObjectLock('[obj_id]');
contextHide();">[lang_toggle_lock]</a></li>
+ <li><a href="#" onClick="toggleMapObjectLock(event, '[obj_id]');
contextHide();return false">[lang_toggle_lock]</a></li>
<!-- BEGIN line -->
<!-- BEGIN line_two_parts -->
- <li><a href="#" onClick="toggleLineMidLock('[obj_id]');
contextHide();">[lang_toggle_line_mid]</a></li>
+ <li><a href="#" onClick="toggleLineMidLock(event, '[obj_id]');
contextHide();return false">[lang_toggle_line_mid]</a></li>
<!-- END line_two_parts -->
<!-- END line -->
<!-- END not_automap -->
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
