Author: Lars Michelsen <[email protected]>
Date: Thu Nov 3 19:13:09 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Nov 3 19:13:09 2011 +0100
Fixed relative coord detection (affects last fix)
---
share/frontend/nagvis-js/js/NagVisObject.js | 5 ++++-
share/frontend/nagvis-js/js/nagvis.js | 9 ++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/share/frontend/nagvis-js/js/NagVisObject.js
b/share/frontend/nagvis-js/js/NagVisObject.js
index a0bc41c..6aa3d1f 100644
--- a/share/frontend/nagvis-js/js/NagVisObject.js
+++ b/share/frontend/nagvis-js/js/NagVisObject.js
@@ -728,7 +728,10 @@ var NagVisObject = Base.extend({
return val;
} else {
var old = this.conf[dir].split(',');
- old[num] = val;
+ if(isRelativeCoord(val))
+ old[num] = val;
+ else
+ old[num] = Math.round(val);
return old.join(',');
}
},
diff --git a/share/frontend/nagvis-js/js/nagvis.js
b/share/frontend/nagvis-js/js/nagvis.js
index 36f9d7b..b485806 100644
--- a/share/frontend/nagvis-js/js/nagvis.js
+++ b/share/frontend/nagvis-js/js/nagvis.js
@@ -1060,6 +1060,13 @@ function isInt(v) {
}
/**
+ * Checks if a variable is a float
+ */
+function isFloat(v) {
+ return parseFloat(v) == v && !isNaN(v);
+}
+
+/**
* Helper to parse px values from dom to numbers
*
* @author Lars Michelsen <[email protected]>
@@ -1069,7 +1076,7 @@ function pxToInt(v) {
}
function isRelativeCoord(v) {
- return !isInt(v) || v.length === 6;
+ return (!isInt(v) && !isFloat(v)) || v.length === 6;
}
function getKeys(o) {
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
