summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpyrocyon <pyrocyon>2011-08-22 23:12:39 +0000
committerpyrocyon <pyrocyon>2011-08-22 23:12:39 +0000
commit2fabd76ca29f2882d4c231783e02bceb3b60895b (patch)
treecd68917bd82f8eb7454cd4e80f1790aaa8dd920b
parent483085bdb3e61f8dc958689c6db1aae67d69eb35 (diff)
Fixing tooltips w/ no graph_options.
-rw-r--r--src/lib/rrdFlot.js6
-rw-r--r--src/lib/rrdFlotMatrix.js6
2 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/rrdFlot.js b/src/lib/rrdFlot.js
index 5743210..3f29566 100644
--- a/src/lib/rrdFlot.js
+++ b/src/lib/rrdFlot.js
@@ -452,7 +452,7 @@ rrdFlot.prototype.bindFlotGraph = function(flot_obj) {
grid: { hoverable: true },
};
- if (this.graph_options!="None") {
+ if (this.graph_options!=null) {
if (typeof(this.graph_options.tooltip)=='boolean'&&this.graph_options.tooltip==true) {
//nothing
}
@@ -468,10 +468,6 @@ rrdFlot.prototype.bindFlotGraph = function(flot_obj) {
graph_options.tooltip=false;
}
}
- else {
- graph_options.grid.hoverable=false;
- graph_options.tooltip=false;
- }
if (legend_id=="None") {
// do nothing
diff --git a/src/lib/rrdFlotMatrix.js b/src/lib/rrdFlotMatrix.js
index 5711394..cbbf93c 100644
--- a/src/lib/rrdFlotMatrix.js
+++ b/src/lib/rrdFlotMatrix.js
@@ -389,7 +389,7 @@ rrdFlotMatrix.prototype.bindFlotGraph = function(flot_obj) {
grid: { hoverable: true },
};
- if (this.graph_options!="None") {
+ if (this.graph_options!=null) {
if (typeof(this.graph_options.tooltip)=='boolean'&&this.graph_options.tooltip==true) {
//nothing
}
@@ -405,10 +405,6 @@ rrdFlotMatrix.prototype.bindFlotGraph = function(flot_obj) {
graph_options.tooltip=false;
}
}
- else {
- graph_options.grid.hoverable=false;
- graph_options.tooltip=false;
- }
if (legend_id=="None") {
// do nothing