FlotTooltip: Create a tooltip callback and fix the hover callback (https://rbcommons.com/s/pepperdata/r/2176)

jeremypepper · jeremypepper · commit 14519e936f40 · 2013-12-09T21:08:52.000-08:00
Needed for custom actions on tooltip click
diff --git a/examples/many_series.html b/examples/many_series.html
@@ -65,6 +65,14 @@ <h1>flot.tooltip plugin example page</h1>
 					shifts: {
 						x: -60,
 						y: 25
+					},
+					onClick: function(item, $tip, isSticky) {
+						if(isSticky) {
+							$tip.css("border-color","red");
+						} else {
+							$tip.css("border-color","black");
+						}
+						
 					}
 				}
 			};
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 2013-12-04
+ * build on 2013-12-09
  * released under MIT License, 2012
 */ 
 (function ($) {
@@ -32,7 +32,8 @@
             stickyable: false,
 
             // callbacks
-            onHover: function(flotItem, $tooltipEl) {}
+            onHover: function(flotItem, $tooltipEl) {},
+            onClick: function(flotItem, $tooltipEl, isSticky) {}
         }
     };
 
@@ -107,7 +108,7 @@
                         .show();
 
                     // run callback
-                    if(typeof that.tooltipOptions.onHover !== 'function') {
+                    if(typeof that.tooltipOptions.onHover === 'function') {
                         that.tooltipOptions.onHover(item, $tip);
                     }
                 }
@@ -123,10 +124,16 @@
                 if(item && !that.stickyItem) {
                     that.stickyItem = item;
                     that.plot.highlight(item.seriesIndex, item.dataIndex);
+                    if(typeof that.tooltipOptions.onClick === 'function') {
+                        that.tooltipOptions.onClick(item, $tip, true);
+                    }
                 }
                 else {
                     hideTooltip();
                     plothover(event,pos,item);
+                    if(typeof that.tooltipOptions.onClick === 'function') {
+                        that.tooltipOptions.onClick(item, $tip, false);
+                    }
                 }
             }
 
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
@@ -21,7 +21,8 @@
             stickyable: false,
 
             // callbacks
-            onHover: function(flotItem, $tooltipEl) {}
+            onHover: function(flotItem, $tooltipEl) {},
+            onClick: function(flotItem, $tooltipEl, isSticky) {}
         }
     };
 
@@ -96,7 +97,7 @@
                         .show();
 
                     // run callback
-                    if(typeof that.tooltipOptions.onHover !== 'function') {
+                    if(typeof that.tooltipOptions.onHover === 'function') {
                         that.tooltipOptions.onHover(item, $tip);
                     }
                 }
@@ -112,10 +113,16 @@
                 if(item && !that.stickyItem) {
                     that.stickyItem = item;
                     that.plot.highlight(item.seriesIndex, item.dataIndex);
+                    if(typeof that.tooltipOptions.onClick === 'function') {
+                        that.tooltipOptions.onClick(item, $tip, true);
+                    }
                 }
                 else {
                     hideTooltip();
                     plothover(event,pos,item);
+                    if(typeof that.tooltipOptions.onClick === 'function') {
+                        that.tooltipOptions.onClick(item, $tip, false);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* author: Krzysztof Urbas @krzysu [myviews.pl]`
`7`	`7`	`* website: https://github.com/krzysu/flot.tooltip`
`8`	`8`	`*`
`9`		`- * build on 2013-12-04`
	`9`	`+ * build on 2013-12-09`
`10`	`10`	`* released under MIT License, 2012`
`11`	`11`	`*/`
`12`	`12`	`(function ($) {`
`@@ -32,7 +32,8 @@`
`32`	`32`	`stickyable: false,`
`33`	`33`
`34`	`34`	`// callbacks`
`35`		`- onHover: function(flotItem, $tooltipEl) {}`
	`35`	`+ onHover: function(flotItem, $tooltipEl) {},`
	`36`	`+ onClick: function(flotItem, $tooltipEl, isSticky) {}`
`36`	`37`	`}`
`37`	`38`	`};`
`38`	`39`
`@@ -107,7 +108,7 @@`
`107`	`108`	`.show();`
`108`	`109`
`109`	`110`	`// run callback`
`110`		`- if(typeof that.tooltipOptions.onHover !== 'function') {`
	`111`	`+ if(typeof that.tooltipOptions.onHover === 'function') {`
`111`	`112`	`that.tooltipOptions.onHover(item, $tip);`
`112`	`113`	`}`
`113`	`114`	`}`
`@@ -123,10 +124,16 @@`
`123`	`124`	`if(item && !that.stickyItem) {`
`124`	`125`	`that.stickyItem = item;`
`125`	`126`	`that.plot.highlight(item.seriesIndex, item.dataIndex);`
	`127`	`+ if(typeof that.tooltipOptions.onClick === 'function') {`
	`128`	`+ that.tooltipOptions.onClick(item, $tip, true);`
	`129`	`+ }`
`126`	`130`	`}`
`127`	`131`	`else {`
`128`	`132`	`hideTooltip();`
`129`	`133`	`plothover(event,pos,item);`
	`134`	`+ if(typeof that.tooltipOptions.onClick === 'function') {`
	`135`	`+ that.tooltipOptions.onClick(item, $tip, false);`
	`136`	`+ }`
`130`	`137`	`}`
`131`	`138`	`}`
`132`	`139`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`	`stickyable: false,`
`22`	`22`
`23`	`23`	`// callbacks`
`24`		`- onHover: function(flotItem, $tooltipEl) {}`
	`24`	`+ onHover: function(flotItem, $tooltipEl) {},`
	`25`	`+ onClick: function(flotItem, $tooltipEl, isSticky) {}`
`25`	`26`	`}`
`26`	`27`	`};`
`27`	`28`
`@@ -96,7 +97,7 @@`
`96`	`97`	`.show();`
`97`	`98`
`98`	`99`	`// run callback`
`99`		`- if(typeof that.tooltipOptions.onHover !== 'function') {`
	`100`	`+ if(typeof that.tooltipOptions.onHover === 'function') {`
`100`	`101`	`that.tooltipOptions.onHover(item, $tip);`
`101`	`102`	`}`
`102`	`103`	`}`
`@@ -112,10 +113,16 @@`
`112`	`113`	`if(item && !that.stickyItem) {`
`113`	`114`	`that.stickyItem = item;`
`114`	`115`	`that.plot.highlight(item.seriesIndex, item.dataIndex);`
	`116`	`+ if(typeof that.tooltipOptions.onClick === 'function') {`
	`117`	`+ that.tooltipOptions.onClick(item, $tip, true);`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`	`else {`
`117`	`121`	`hideTooltip();`
`118`	`122`	`plothover(event,pos,item);`
	`123`	`+ if(typeof that.tooltipOptions.onClick === 'function') {`
	`124`	`+ that.tooltipOptions.onClick(item, $tip, false);`
	`125`	`+ }`
`119`	`126`	`}`
`120`	`127`	`}`
`121`	`128`