playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix focus/defocus

pull/590/head
Masayuki Tanaka 10 years ago
parent
9142800b93
commit
bb6536b8fe
4 changed files with 47 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      c3.js
  2. 2
      c3.min.js
  3. 6
      src/api.focus.js
  4. 28
      src/api.show.js

34
c3.js
Unescape View File

@ -5353,7 +5353,7 @@
c3_chart_fn.focus = function (targetIds) {
var $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
targetIds = $$.mapToTargetIds(targetIds).filter($$.isTargetToShow, $$);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds)),
this.revert();
@ -5373,7 +5373,7 @@
c3_chart_fn.defocus = function (targetIds) {
var $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
targetIds = $$.mapToTargetIds(targetIds).filter($$.isTargetToShow, $$);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds)),
this.revert();
@ -5392,7 +5392,7 @@
c3_chart_fn.revert = function (targetIds) {
var $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
targetIds = $$.mapToTargetIds(targetIds).filter($$.isTargetToShow, $$);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds));
candidates.classed(CLASS.focused, false).classed(CLASS.defocused, false);
@ -5406,15 +5406,21 @@
};
c3_chart_fn.show = function (targetIds, options) {
var $$ = this.internal;
var $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
$$.removeHiddenTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds))
.transition()
.style('opacity', 1);
targets = $$.svg.selectAll($$.selectorTargets(targetIds));
targets.transition()
.style('opacity', 1, 'important')
.call($$.endall, function () {
targets.style('opacity', null).style('opacity', 1)
.classed(CLASS.focused, false)
.classed(CLASS.defocused, false);
});
if (options.withLegend) {
$$.showLegend(targetIds);
@ -5424,15 +5430,21 @@
};
c3_chart_fn.hide = function (targetIds, options) {
var $$ = this.internal;
var $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
$$.addHiddenTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds))
.transition()
.style('opacity', 0);
targets = $$.svg.selectAll($$.selectorTargets(targetIds));
targets.transition()
.style('opacity', 0, 'important')
.call($$.endall, function () {
targets.style('opacity', null).style('opacity', 0)
.classed(CLASS.focused, false)
.classed(CLASS.defocused, false);
});
if (options.withLegend) {
$$.hideLegend(targetIds);

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/api.focus.js
Unescape View File

@ -1,7 +1,7 @@
c3_chart_fn.focus = function (targetIds) {
var $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
targetIds = $$.mapToTargetIds(targetIds).filter($$.isTargetToShow, $$);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds)),
this.revert();
@ -21,7 +21,7 @@ c3_chart_fn.focus = function (targetIds) {
c3_chart_fn.defocus = function (targetIds) {
var $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
targetIds = $$.mapToTargetIds(targetIds).filter($$.isTargetToShow, $$);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds)),
this.revert();
@ -40,7 +40,7 @@ c3_chart_fn.defocus = function (targetIds) {
c3_chart_fn.revert = function (targetIds) {
var $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
targetIds = $$.mapToTargetIds(targetIds).filter($$.isTargetToShow, $$);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds));
candidates.classed(CLASS.focused, false).classed(CLASS.defocused, false);

28
src/api.show.js
Unescape View File

@ -1,13 +1,19 @@
c3_chart_fn.show = function (targetIds, options) {
var $$ = this.internal;
var $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
$$.removeHiddenTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds))
.transition()
.style('opacity', 1);
targets = $$.svg.selectAll($$.selectorTargets(targetIds));
targets.transition()
.style('opacity', 1, 'important')
.call($$.endall, function () {
targets.style('opacity', null).style('opacity', 1)
.classed(CLASS.focused, false)
.classed(CLASS.defocused, false);
});
if (options.withLegend) {
$$.showLegend(targetIds);
@ -17,15 +23,21 @@ c3_chart_fn.show = function (targetIds, options) {
};
c3_chart_fn.hide = function (targetIds, options) {
var $$ = this.internal;
var $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
$$.addHiddenTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds))
.transition()
.style('opacity', 0);
targets = $$.svg.selectAll($$.selectorTargets(targetIds));
targets.transition()
.style('opacity', 0, 'important')
.call($$.endall, function () {
targets.style('opacity', null).style('opacity', 0)
.classed(CLASS.focused, false)
.classed(CLASS.defocused, false);
});
if (options.withLegend) {
$$.hideLegend(targetIds);

Write Preview
Loading…
Cancel
Save