Skip to content

C
c3-closed
Commit d3c7502c authored by Evgeny's avatar Evgeny
Browse files
Options

Fix axis test when rotated issue

parent 8532d2ed
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
c3.js
View file @ d3c7502c
...@@ -4078,7 +4078,7 @@ ...@@ -4078,7 +4078,7 @@
this.legendStep = step; this.legendStep = step;
}; };
c3_chart_internal_fn.updateLegendItemWidth = function (w) { c3_chart_internal_fn.updateLegendItemWidth = function (w) {
this.legendItemWidth = w + (isNode() ? 10 : 0); this.legendItemWidth = w;
}; };
c3_chart_internal_fn.updateLegendItemHeight = function (h) { c3_chart_internal_fn.updateLegendItemHeight = function (h) {
this.legendItemHeight = h; this.legendItemHeight = h;
...@@ -4166,7 +4166,7 @@ ...@@ -4166,7 +4166,7 @@
var hasFocused = $$.legend.selectAll('.' + CLASS.legendItemFocused).size(); var hasFocused = $$.legend.selectAll('.' + CLASS.legendItemFocused).size();
var texts, rects, tiles, background; var texts, rects, tiles, background;
var nodeOffset = typeof process === 'undefined' ? 1 : 3; var nodeOffset = isNode() ? 1 : 3;
options = options || {}; options = options || {};
withTransition = getOption(options, "withTransition", true); withTransition = getOption(options, "withTransition", true);
...@@ -4549,10 +4549,10 @@ ...@@ -4549,10 +4549,10 @@
isInner: position.indexOf('inner') >= 0, isInner: position.indexOf('inner') >= 0,
isOuter: position.indexOf('outer') >= 0, isOuter: position.indexOf('outer') >= 0,
isLeft: position.indexOf('left') >= 0, isLeft: position.indexOf('left') >= 0,
isCenter: position.indexOf('center') >= 0, isCenter: position.indexOf('center') >= 0 || position.indexOf('middle') >= 0,
isRight: position.indexOf('right') >= 0, isRight: position.indexOf('right') >= 0,
isTop: position.indexOf('top') >= 0, isTop: position.indexOf('top') >= 0,
isMiddle: position.indexOf('middle') >= 0, isMiddle: position.indexOf('middle') >= 0 || position.indexOf('center') >= 0,
isBottom: position.indexOf('bottom') >= 0 isBottom: position.indexOf('bottom') >= 0
}; };
}; };
...@@ -5438,7 +5438,7 @@ ...@@ -5438,7 +5438,7 @@
main.select('.' + CLASS.chartArcsTitle) main.select('.' + CLASS.chartArcsTitle)
.style("opacity", $$.hasType('donut') || $$.hasType('gauge') ? 1 : 0); .style("opacity", $$.hasType('donut') || $$.hasType('gauge') ? 1 : 0);
if(typeof process !== 'object' && ($$.config.hasSubs || $$.config.isSub)){ if(!isNode() && ($$.config.hasSubs || $$.config.isSub)){
$$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){ $$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){
$$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){ $$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){
$$.ed3Internal.redrawLinesOnBoth(); $$.ed3Internal.redrawLinesOnBoth();
......
c3.min.js
View file @ d3c7502c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/arc.js
View file @ d3c7502c
...@@ -304,7 +304,7 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf ...@@ -304,7 +304,7 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
main.select('.' + CLASS.chartArcsTitle) main.select('.' + CLASS.chartArcsTitle)
.style("opacity", $$.hasType('donut') || $$.hasType('gauge') ? 1 : 0); .style("opacity", $$.hasType('donut') || $$.hasType('gauge') ? 1 : 0);
if(typeof process !== 'object' && ($$.config.hasSubs || $$.config.isSub)){ if(!isNode() && ($$.config.hasSubs || $$.config.isSub)){
$$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){ $$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){
$$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){ $$.buffer.onlastfinish("draw-lines"+$$.config.isSub, function(){
$$.ed3Internal.redrawLinesOnBoth(); $$.ed3Internal.redrawLinesOnBoth();
......
src/axis.js
View file @ d3c7502c
...@@ -154,10 +154,10 @@ c3_chart_internal_fn.getAxisLabelPosition = function (axisId, defaultPosition) { ...@@ -154,10 +154,10 @@ c3_chart_internal_fn.getAxisLabelPosition = function (axisId, defaultPosition) {
isInner: position.indexOf('inner') >= 0, isInner: position.indexOf('inner') >= 0,
isOuter: position.indexOf('outer') >= 0, isOuter: position.indexOf('outer') >= 0,
isLeft: position.indexOf('left') >= 0, isLeft: position.indexOf('left') >= 0,
isCenter: position.indexOf('center') >= 0, isCenter: position.indexOf('center') >= 0 || position.indexOf('middle') >= 0,
isRight: position.indexOf('right') >= 0, isRight: position.indexOf('right') >= 0,
isTop: position.indexOf('top') >= 0, isTop: position.indexOf('top') >= 0,
isMiddle: position.indexOf('middle') >= 0, isMiddle: position.indexOf('middle') >= 0 || position.indexOf('center') >= 0,
isBottom: position.indexOf('bottom') >= 0 isBottom: position.indexOf('bottom') >= 0
}; };
}; };
......
src/legend.js
View file @ d3c7502c
...@@ -37,7 +37,7 @@ c3_chart_internal_fn.updateLegendStep = function (step) { ...@@ -37,7 +37,7 @@ c3_chart_internal_fn.updateLegendStep = function (step) {
this.legendStep = step; this.legendStep = step;
}; };
c3_chart_internal_fn.updateLegendItemWidth = function (w) { c3_chart_internal_fn.updateLegendItemWidth = function (w) {
this.legendItemWidth = w + (isNode() ? 10 : 0); this.legendItemWidth = w;
}; };
c3_chart_internal_fn.updateLegendItemHeight = function (h) { c3_chart_internal_fn.updateLegendItemHeight = function (h) {
this.legendItemHeight = h; this.legendItemHeight = h;
...@@ -125,7 +125,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) { ...@@ -125,7 +125,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
var hasFocused = $$.legend.selectAll('.' + CLASS.legendItemFocused).size(); var hasFocused = $$.legend.selectAll('.' + CLASS.legendItemFocused).size();
var texts, rects, tiles, background; var texts, rects, tiles, background;
var nodeOffset = typeof process === 'undefined' ? 1 : 3; var nodeOffset = isNode() ? 1 : 3;
options = options || {}; options = options || {};
withTransition = getOption(options, "withTransition", true); withTransition = getOption(options, "withTransition", true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment