Skip entries whose labelFormatter returns null.

974bd051 · David Schnur · 2bc87913 · 974bd051
Commit 974bd051 authored Jul 16, 2012 by David Schnur
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

jquery.flot.js jquery.flot.js +7 -4

No files found.
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -2126,12 +2126,15 @@
            for (var i = 0; i < series.length; ++i) {
                s = series[i];
                if (s.label) {
+                    label = lf ? lf(s.label, s) : s.label;
+                    if (label) {
                        entries.push({
-                        label: lf ? lf(s.label, s) : s.label,
+                            label: label,
                            color: s.color
                        });
                    }
                }
+            }

            // Sort the legend using either the default or a custom comparator