From 2fabd76ca29f2882d4c231783e02bceb3b60895b Mon Sep 17 00:00:00 2001 From: pyrocyon Date: Mon, 22 Aug 2011 23:12:39 +0000 Subject: Fixing tooltips w/ no graph_options. --- src/lib/rrdFlot.js | 6 +----- src/lib/rrdFlotMatrix.js | 6 +----- 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 -- cgit v1.2.3