Merge pull request #63 from LoicUV/categories-mode-support

support for categories plugin when using custom ticks labels on y axis
krzysu · Feb 10, 2014 · 744ea16 · 744ea16
2 parents e73390f + 1450be1
commit 744ea16
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/js/jquery.flot.tooltip.js b/js/jquery.flot.tooltip.js
@@ -6,7 +6,7 @@
  * author: Krzysztof Urbas @krzysu [myviews.pl]
  * website: https://github.com/krzysu/flot.tooltip
  * 
- * build on 2014-02-07
+ * build on 2014-02-10
  * released under MIT License, 2012
 */ 
 (function ($) {
@@ -68,13 +68,13 @@
             // bind event
             $( plot.getPlaceholder() ).bind("plothover", plothover);
 
-			$(eventHolder).bind('mousemove', mouseMove);
+            $(eventHolder).bind('mousemove', mouseMove);
         });
 
-		plot.hooks.shutdown.push(function (plot, eventHolder){
-			$(plot.getPlaceholder()).unbind("plothover", plothover);
-			$(eventHolder).unbind("mousemove", mouseMove);
-		});
+        plot.hooks.shutdown.push(function (plot, eventHolder){
+            $(plot.getPlaceholder()).unbind("plothover", plothover);
+            $(eventHolder).unbind("mousemove", mouseMove);
+        });
 
         function mouseMove(e){
             var pos = {};
@@ -83,8 +83,8 @@
             that.updateTooltipPosition(pos);
         }
 
-		function plothover(event, pos, item) {
-			var $tip = that.getDomElement();
+        function plothover(event, pos, item) {
+            var $tip = that.getDomElement();
             if (item) {
                 var tipText;
 
@@ -232,7 +232,8 @@
         if(typeof item.series.yaxis.ticks !== 'undefined') {
             for (var index in item.series.yaxis.ticks) {
                 if (item.series.yaxis.ticks.hasOwnProperty(index)) {
-                    if (item.series.yaxis.ticks[index].v === y) {
+                    var value = (this.isCategoriesMode('yaxis', item)) ? item.series.yaxis.ticks[index].label : item.series.yaxis.ticks[index].v;
+                    if (value === y) {
                         content = content.replace(yPattern, item.series.yaxis.ticks[index].label);
                     }
                 }
@@ -265,6 +266,10 @@
         return (typeof this.tooltipOptions.yDateFormat !== 'undefined' && this.tooltipOptions.yDateFormat !== null);
     };
 
+    FlotTooltip.prototype.isCategoriesMode = function(axisName, item) {
+        return (typeof item.series[axisName].options.mode !== 'undefined' && item.series[axisName].options.mode === 'categories');
+    };
+
     //
     FlotTooltip.prototype.timestampToDate = function(tmst, dateFormat) {
         var theDate = new Date(tmst*1);

diff --git a/js/jquery.flot.tooltip.min.js b/js/jquery.flot.tooltip.min.js
diff --git a/js/jquery.flot.tooltip.source.js b/js/jquery.flot.tooltip.source.js
@@ -57,13 +57,13 @@
             // bind event
             $( plot.getPlaceholder() ).bind("plothover", plothover);
 
-			$(eventHolder).bind('mousemove', mouseMove);
+            $(eventHolder).bind('mousemove', mouseMove);
         });
 
-		plot.hooks.shutdown.push(function (plot, eventHolder){
-			$(plot.getPlaceholder()).unbind("plothover", plothover);
-			$(eventHolder).unbind("mousemove", mouseMove);
-		});
+        plot.hooks.shutdown.push(function (plot, eventHolder){
+            $(plot.getPlaceholder()).unbind("plothover", plothover);
+            $(eventHolder).unbind("mousemove", mouseMove);
+        });
 
         function mouseMove(e){
             var pos = {};
@@ -72,8 +72,8 @@
             that.updateTooltipPosition(pos);
         }
 
-		function plothover(event, pos, item) {
-			var $tip = that.getDomElement();
+        function plothover(event, pos, item) {
+            var $tip = that.getDomElement();
             if (item) {
                 var tipText;
 
@@ -221,7 +221,8 @@
         if(typeof item.series.yaxis.ticks !== 'undefined') {
             for (var index in item.series.yaxis.ticks) {
                 if (item.series.yaxis.ticks.hasOwnProperty(index)) {
-                    if (item.series.yaxis.ticks[index].v === y) {
+                    var value = (this.isCategoriesMode('yaxis', item)) ? item.series.yaxis.ticks[index].label : item.series.yaxis.ticks[index].v;
+                    if (value === y) {
                         content = content.replace(yPattern, item.series.yaxis.ticks[index].label);
                     }
                 }
@@ -254,6 +255,10 @@
         return (typeof this.tooltipOptions.yDateFormat !== 'undefined' && this.tooltipOptions.yDateFormat !== null);
     };
 
+    FlotTooltip.prototype.isCategoriesMode = function(axisName, item) {
+        return (typeof item.series[axisName].options.mode !== 'undefined' && item.series[axisName].options.mode === 'categories');
+    };
+
     //
     FlotTooltip.prototype.timestampToDate = function(tmst, dateFormat) {
         var theDate = new Date(tmst*1);