Added support for disabling interactivity for specific plots

git-svn-id: https://flot.googlecode.com/svn/trunk@107 1e0a6537-2640-0410-bfb7-f154510ff394

API.txt

@@ -59,6 +59,8 @@ The format of a single series object is as follows:
     points: specific points options,
     xaxis: 1 or 2,
     yaxis: 1 or 2,
+    clickable: boolean
+    hoverable: boolean
     shadowSize: number
   }
 
@@ -88,6 +90,10 @@ to get the secondary axis (x axis at top or y axis to the right).
 E.g., you can use this to make a dual axis plot by specifying
 { yaxis: 2 } for one data series.
 
+"clickable" and "hoverable" can be set to false to disable
+interactivity for specific series if interactivity is turned on in
+plot, see below.
+
 The rest of the options are all documented below as they are the same
 as the default options passed in via the options parameter in the plot
 commmand. When you specify them for a specific data series, they will
@@ -571,6 +577,10 @@ and still activate it. If there are two or more points within this
 radius, Flot chooses the closest item. For bars, the top-most bar
 (from the latest specified data series) is chosen.
 
+If you want to disable interactivity for a specific data series, you
+can set "hoverable" and "clickable" to false in the options for that
+series, like this { data: [...], label: "Foo", clickable: false }.
+
 
 Customizing the selection
 =========================

NEWS.txt

@@ -1,6 +1,12 @@
 Flot 0.x
 --------
 
+New features:
+
+- Added support for disabling interactivity for specific data series
+  (request from Ronald Schouten and Steve Upton).
+
+
 Bug fixes:
 
 - Fixed two corner-case bugs when drawing filled curves (report and

jquery.flot.js

@@ -1565,7 +1565,7 @@
             hoverTimeout = null;
         
         // Returns the data item the mouse is over, or null if none is found
-        function findNearbyItem(mouseX, mouseY) {
+        function findNearbyItem(mouseX, mouseY, seriesFilter) {
             var maxDistance = options.grid.mouseActiveRadius,
                 lowestDistance = maxDistance * maxDistance + 1,
                 item = null, foundPoint = false;
@@ -1578,6 +1578,9 @@
             }
             
             for (var i = 0; i < series.length; ++i) {
+                if (!seriesFilter(series[i]))
+                    continue;
+                
                 var data = series[i].data,
                     axisx = series[i].xaxis,
                     axisy = series[i].yaxis,
@@ -1682,17 +1685,19 @@
                 return;
             }
 
-            triggerClickHoverEvent("plotclick", e);
+            triggerClickHoverEvent("plotclick", e,
+                                   function (s) { return s["clickable"] != false; });
         }
         
         function onHover() {
-            triggerClickHoverEvent("plothover", lastMousePos);
+            triggerClickHoverEvent("plothover", lastMousePos,
+                                   function (s) { return s["hoverable"] != false; });
             hoverTimeout = null;
         }
 
         // trigger click or hover event (they send the same parameters
         // so we share their code)
-        function triggerClickHoverEvent(eventname, event) {
+        function triggerClickHoverEvent(eventname, event, seriesFilter) {
             var offset = eventHolder.offset(),
                 pos = { pageX: event.pageX, pageY: event.pageY },
                 canvasX = event.pageX - offset.left - plotOffset.left,
@@ -1707,7 +1712,7 @@
             if (axes.y2axis.used)
                 pos.y2 = axes.y2axis.c2p(canvasY);
 
-            var item = findNearbyItem(canvasX, canvasY);
+            var item = findNearbyItem(canvasX, canvasY, seriesFilter);
 
             if (item) {
                 // fill in mouse pos for any listeners out there
@@ -1718,15 +1723,17 @@
             }
 
             if (options.grid.autoHighlight) {
+                // clear auto-highlights
                 for (var i = 0; i < highlights.length; ++i) {
                     var h = highlights[i];
-                    if (h.auto &&
+                    console.log(h.auto, eventname)
+                    if (h.auto == eventname &&
                         !(item && h.series == item.series && h.point == item.datapoint))
                         unhighlight(h.series, h.point);
                 }
                 
                 if (item)
-                    highlight(item.series, item.datapoint, true);
+                    highlight(item.series, item.datapoint, eventname);
             }
             
             target.trigger(eventname, [ pos, item ]);