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

Fix conflict

pull/1207/head
Masayuki Tanaka 9 years ago
parent
fb51543383 9c3bc1e5cb
commit
5a3226dd0e
4 changed files with 63 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      c3.js
  2. 10
      c3.min.js
  3. 27
      src/arc.js
  4. 9
      src/config.js

36
c3.js
Unescape View File

@ -1194,22 +1194,25 @@
pie_label_show: true, pie_label_show: true,
pie_label_format: undefined, pie_label_format: undefined,
pie_label_threshold: 0.05, pie_label_threshold: 0.05,
pie_expand: true, pie_expand: {},
pie_expand_duration: 50,
// gauge // gauge
gauge_label_show: true, gauge_label_show: true,
gauge_label_format: undefined, gauge_label_format: undefined,
gauge_expand: true,
gauge_min: 0, gauge_min: 0,
gauge_max: 100, gauge_max: 100,
gauge_units: undefined, gauge_units: undefined,
gauge_width: undefined, gauge_width: undefined,
gauge_expand: {},
gauge_expand_duration: 50,
// donut // donut
donut_label_show: true, donut_label_show: true,
donut_label_format: undefined, donut_label_format: undefined,
donut_label_threshold: 0.05, donut_label_threshold: 0.05,
donut_width: undefined, donut_width: undefined,
donut_expand: true,
donut_title: "", donut_title: "",
donut_expand: {},
donut_expand_duration: 50,
// region - region to change style // region - region to change style
regions: [], regions: [],
// tooltip - show when mouseover on each data // tooltip - show when mouseover on each data
@ -4800,9 +4803,9 @@
$$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).each(function (d) { $$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).each(function (d) {
if (! $$.shouldExpand(d.data.id)) { return; } if (! $$.shouldExpand(d.data.id)) { return; }
$$.d3.select(this).selectAll('path') $$.d3.select(this).selectAll('path')
.transition().duration(50) .transition().duration($$.expandDuration(d.data.id))
.attr("d", $$.svgArcExpanded) .attr("d", $$.svgArcExpanded)
.transition().duration(100) .transition().duration($$.expandDuration(d.data.id) * 2)
.attr("d", $$.svgArcExpandedSub) .attr("d", $$.svgArcExpandedSub)
.each(function (d) { .each(function (d) {
if ($$.isDonutType(d.data)) { if ($$.isDonutType(d.data)) {
@ -4820,15 +4823,34 @@
targetIds = $$.mapToTargetIds(targetIds); targetIds = $$.mapToTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).selectAll('path') $$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).selectAll('path')
.transition().duration(50) .transition().duration(function(d) {
return $$.expandDuration(d.data.id);
})
.attr("d", $$.svgArc); .attr("d", $$.svgArc);
$$.svg.selectAll('.' + CLASS.arc) $$.svg.selectAll('.' + CLASS.arc)
.style("opacity", 1); .style("opacity", 1);
}; };
c3_chart_internal_fn.expandDuration = function (id) {
var $$ = this, config = $$.config;
if ($$.isDonutType(id)) {
return config.donut_expand_duration;
} else if ($$.isGaugeType(id)) {
return config.gauge_expand_duration;
} else if ($$.isPieType(id)) {
return config.pie_expand_duration;
} else {
return 50;
}
};
c3_chart_internal_fn.shouldExpand = function (id) { c3_chart_internal_fn.shouldExpand = function (id) {
var $$ = this, config = $$.config; var $$ = this, config = $$.config;
return ($$.isDonutType(id) && config.donut_expand) || ($$.isGaugeType(id) && config.gauge_expand) || ($$.isPieType(id) && config.pie_expand); return ($$.isDonutType(id) && config.donut_expand) ||
($$.isGaugeType(id) && config.gauge_expand) ||
($$.isPieType(id) && config.pie_expand);
}; };
c3_chart_internal_fn.shouldShowArcLabel = function () { c3_chart_internal_fn.shouldShowArcLabel = function () {

10
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

27
src/arc.js
Unescape View File

@ -143,9 +143,9 @@ c3_chart_internal_fn.expandArc = function (targetIds) {
$$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).each(function (d) { $$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).each(function (d) {
if (! $$.shouldExpand(d.data.id)) { return; } if (! $$.shouldExpand(d.data.id)) { return; }
$$.d3.select(this).selectAll('path') $$.d3.select(this).selectAll('path')
.transition().duration(50) .transition().duration($$.expandDuration(d.data.id))
.attr("d", $$.svgArcExpanded) .attr("d", $$.svgArcExpanded)
.transition().duration(100) .transition().duration($$.expandDuration(d.data.id) * 2)
.attr("d", $$.svgArcExpandedSub) .attr("d", $$.svgArcExpandedSub)
.each(function (d) { .each(function (d) {
if ($$.isDonutType(d.data)) { if ($$.isDonutType(d.data)) {
@ -163,15 +163,34 @@ c3_chart_internal_fn.unexpandArc = function (targetIds) {
targetIds = $$.mapToTargetIds(targetIds); targetIds = $$.mapToTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).selectAll('path') $$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).selectAll('path')
.transition().duration(50) .transition().duration(function(d) {
return $$.expandDuration(d.data.id);
})
.attr("d", $$.svgArc); .attr("d", $$.svgArc);
$$.svg.selectAll('.' + CLASS.arc) $$.svg.selectAll('.' + CLASS.arc)
.style("opacity", 1); .style("opacity", 1);
}; };
c3_chart_internal_fn.expandDuration = function (id) {
var $$ = this, config = $$.config;
if ($$.isDonutType(id)) {
return config.donut_expand_duration;
} else if ($$.isGaugeType(id)) {
return config.gauge_expand_duration;
} else if ($$.isPieType(id)) {
return config.pie_expand_duration;
} else {
return 50;
}
};
c3_chart_internal_fn.shouldExpand = function (id) { c3_chart_internal_fn.shouldExpand = function (id) {
var $$ = this, config = $$.config; var $$ = this, config = $$.config;
return ($$.isDonutType(id) && config.donut_expand) || ($$.isGaugeType(id) && config.gauge_expand) || ($$.isPieType(id) && config.pie_expand); return ($$.isDonutType(id) && config.donut_expand) ||
($$.isGaugeType(id) && config.gauge_expand) ||
($$.isPieType(id) && config.pie_expand);
}; };
c3_chart_internal_fn.shouldShowArcLabel = function () { c3_chart_internal_fn.shouldShowArcLabel = function () {

9
src/config.js
Unescape View File

@ -167,22 +167,25 @@ c3_chart_internal_fn.getDefaultConfig = function () {
pie_label_show: true, pie_label_show: true,
pie_label_format: undefined, pie_label_format: undefined,
pie_label_threshold: 0.05, pie_label_threshold: 0.05,
pie_expand: true, pie_expand: {},
pie_expand_duration: 50,
// gauge // gauge
gauge_label_show: true, gauge_label_show: true,
gauge_label_format: undefined, gauge_label_format: undefined,
gauge_expand: true,
gauge_min: 0, gauge_min: 0,
gauge_max: 100, gauge_max: 100,
gauge_units: undefined, gauge_units: undefined,
gauge_width: undefined, gauge_width: undefined,
gauge_expand: {},
gauge_expand_duration: 50,
// donut // donut
donut_label_show: true, donut_label_show: true,
donut_label_format: undefined, donut_label_format: undefined,
donut_label_threshold: 0.05, donut_label_threshold: 0.05,
donut_width: undefined, donut_width: undefined,
donut_expand: true,
donut_title: "", donut_title: "",
donut_expand: {},
donut_expand_duration: 50,
// region - region to change style // region - region to change style
regions: [], regions: [],
// tooltip - show when mouseover on each data // tooltip - show when mouseover on each data

Write Preview
Loading…
Cancel
Save