Fix legend state when revert called - #782

74bd5369 · Masayuki Tanaka · 1333c1e9 · 74bd5369 · 74bd5369 · 74bd5369
Commit 74bd5369 authored Dec 01, 2014 by Masayuki Tanaka
Showing with 14 additions and 16 deletions

c3.js c3.js +7 -8

c3.min.js c3.min.js +0 -0

api.focus-spec.js spec/api.focus-spec.js +0 -0

api.focus.js src/api.focus.js +1 -1

class.js src/class.js +1 -1

legend.js src/legend.js +5 -6

No files found.
--- a/c3.js
+++ b/c3.js
@@ -3732,12 +3732,11 @@
        var $$ = this;
        targetIds = $$.mapToTargetIds(targetIds);
        $$.legend.selectAll('.' + CLASS.legendItem)
-            .classed(CLASS.legendItemFocused, function (id) {
+            .filter(function (id) { return targetIds.indexOf(id) >= 0; })
-                return targetIds.indexOf(id) >= 0 && focus;
+            .classed(CLASS.legendItemFocused, focus)
-            })
+          .transition().duration(100)
-            .transition().duration(100)
+            .style('opacity', function () {
-            .style('opacity', function (id) {
+                var opacity = focus ? $$.opacityForLegend : $$.opacityForUnfocusedLegend;
-                var opacity = targetIds.indexOf(id) >= 0 && focus ? $$.opacityForLegend : $$.opacityForUnfocusedLegend;
                return opacity.call($$, $$.d3.select(this));
            });
    };
@@ -5592,7 +5591,7 @@
    };
    c3_chart_internal_fn.selectorLegends = function (ids) {
        var $$ = this;
-        return ids.length ? ids.map(function (id) { return $$.selectorLegend(id); }) : null;
+        return ids && ids.length ? ids.map(function (id) { return $$.selectorLegend(id); }) : null;
    };
    var isValue = c3_chart_internal_fn.isValue = function (v) {
@@ -5691,7 +5690,7 @@
        if ($$.hasArcType()) {
            $$.unexpandArc(targetIds);
        }
-        $$.revertLegend();
+        $$.showLegend(targetIds);
        $$.focusedTargetIds = [];
        $$.defocusedTargetIds = [];

--- a/c3.min.js
+++ b/c3.min.js
--- a/spec/api.focus-spec.js
+++ b/spec/api.focus-spec.js
--- a/src/api.focus.js
+++ b/src/api.focus.js
@@ -47,7 +47,7 @@ c3_chart_fn.revert = function (targetIds) {
    if ($$.hasArcType()) {
        $$.unexpandArc(targetIds);
    }
-    $$.revertLegend();
+    $$.showLegend(targetIds);
    $$.focusedTargetIds = [];
    $$.defocusedTargetIds = [];

--- a/src/class.js
+++ b/src/class.js
@@ -170,5 +170,5 @@ c3_chart_internal_fn.selectorLegend = function (id) {
 };
 c3_chart_internal_fn.selectorLegends = function (ids) {
    var $$ = this;
-    return ids.length ? ids.map(function (id) { return $$.selectorLegend(id); }) : null;
+    return ids && ids.length ? ids.map(function (id) { return $$.selectorLegend(id); }) : null;
 };
--- a/src/legend.js
+++ b/src/legend.js
@@ -66,12 +66,11 @@ c3_chart_internal_fn.toggleFocusLegend = function (targetIds, focus) {
    var $$ = this;
    targetIds = $$.mapToTargetIds(targetIds);
    $$.legend.selectAll('.' + CLASS.legendItem)
-        .classed(CLASS.legendItemFocused, function (id) {
+        .filter(function (id) { return targetIds.indexOf(id) >= 0; })
-            return targetIds.indexOf(id) >= 0 && focus;
+        .classed(CLASS.legendItemFocused, focus)
-        })
+      .transition().duration(100)
-        .transition().duration(100)
+        .style('opacity', function () {
-        .style('opacity', function (id) {
+            var opacity = focus ? $$.opacityForLegend : $$.opacityForUnfocusedLegend;
-            var opacity = targetIds.indexOf(id) >= 0 && focus ? $$.opacityForLegend : $$.opacityForUnfocusedLegend;
            return opacity.call($$, $$.d3.select(this));
        });
 };