Author: Lars Michelsen <[email protected]>
Date: Mon Apr 2 11:49:24 2012 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Mon Apr 2 11:49:24 2012 +0200
Added zoom handling for gadgets; Fixed js error on overview page
---
TODO | 8 +++-----
share/frontend/nagvis-js/js/NagVisService.js | 1 +
share/frontend/nagvis-js/js/frontend.js | 4 ++--
share/frontend/nagvis-js/js/nagvis.js | 4 ----
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/TODO b/TODO
index ebad772..4ea4a0d 100644
--- a/TODO
+++ b/TODO
@@ -152,11 +152,9 @@ Offene Fragen:
Die Position hängt eher am Container
-> Nachdenken
-- Wenn der Zoom Faktor pro Nutzer gespeichert wird, wird dieser dann pro Map
- oder für alle Maps festgelegt?
- -> Kunden Fragen
-
-- View Parameter pro Nutzer & pro Map speichern
+ - Wenn man beim Verändern der Höhe/Breite auch die Position verändert,
dann
+ würden die Objekte vermutlich korrekt positionert werden können. Dieses
+ Offset müsste dann beim Editieren der Objekte berücksichtigt werden.
- Wie soll die GUI (Hover, Context, Header Menu skalieren?) -> Gar nicht?
-> Kunden Fragen
diff --git a/share/frontend/nagvis-js/js/NagVisService.js
b/share/frontend/nagvis-js/js/NagVisService.js
index 1662ce2..372a58a 100644
--- a/share/frontend/nagvis-js/js/NagVisService.js
+++ b/share/frontend/nagvis-js/js/NagVisService.js
@@ -71,6 +71,7 @@ var NagVisService = NagVisStatefulObject.extend({
if(this.conf.gadget_type === 'img') {
var oGadget = document.createElement('img');
+ addZoomHandler(oGadget);
oGadget.src = this.conf.gadget_url + sParams;
oGadget.alt = this.conf.type + '-' + alt;
} else {
diff --git a/share/frontend/nagvis-js/js/frontend.js
b/share/frontend/nagvis-js/js/frontend.js
index b8f4859..7839653 100644
--- a/share/frontend/nagvis-js/js/frontend.js
+++ b/share/frontend/nagvis-js/js/frontend.js
@@ -1419,9 +1419,9 @@ function getViewParams(update, userParams) {
if(!isset(userParams))
userParams = false;
- if(!userParams && isset(oViewProperties['params'])) {
+ if(!userParams && isset(oViewProperties) &&
isset(oViewProperties['params'])) {
var params = oViewProperties['params'];
- } else if(isset(oViewProperties['params'])) {
+ } else if(isset(oViewProperties) && isset(oViewProperties['params'])) {
var params = oViewProperties['user_params'];
} else {
return '';
diff --git a/share/frontend/nagvis-js/js/nagvis.js
b/share/frontend/nagvis-js/js/nagvis.js
index 5f79295..208db35 100644
--- a/share/frontend/nagvis-js/js/nagvis.js
+++ b/share/frontend/nagvis-js/js/nagvis.js
@@ -1257,8 +1257,6 @@ function scaleView() {
*/
function addZoomFactor(coord) {
var zoom = getViewParam('zoom');
- // FIXME: How to get the default? (-> configured in global section)
- // Also take the user stored values into account
if(zoom === null)
zoom = 100;
return parseInt(coord * parseInt(zoom) / 100);
@@ -1266,8 +1264,6 @@ function addZoomFactor(coord) {
function rmZoomFactor(coord) {
var zoom = getViewParam('zoom');
- // FIXME: How to get the default? (-> configured in global section)
- // Also take the user stored values into account
if(zoom === null)
zoom = 100;
return parseInt(coord / parseInt(zoom) * 100);
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
