Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
c3-closed
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
charts
c3-closed
Commits
333a0293
Commit
333a0293
authored
Mar 05, 2016
by
Дмитрий Никулин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update c3.js and c3.min.js
parent
7bb932f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
6 deletions
+48
-6
c3.js
c3.js
+48
-6
c3.min.js
c3.min.js
+0
-0
No files found.
c3.js
View file @
333a0293
...
@@ -1418,6 +1418,11 @@
...
@@ -1418,6 +1418,11 @@
tooltip_init_show
:
false
,
tooltip_init_show
:
false
,
tooltip_init_x
:
0
,
tooltip_init_x
:
0
,
tooltip_init_position
:
{
top
:
'0px'
,
left
:
'50px'
},
tooltip_init_position
:
{
top
:
'0px'
,
left
:
'50px'
},
// default additional tick padding
tick_text_padding
:
0
,
tick_text_h_to_w
:
1.76
,
// used when size is not available yet
default_tick_width
:
30
,
// caching
// caching
shouldCache
:
true
shouldCache
:
true
};
};
...
@@ -4487,7 +4492,7 @@
...
@@ -4487,7 +4492,7 @@
tickWidth
:
config
.
axis_x_tick_width
,
tickWidth
:
config
.
axis_x_tick_width
,
withoutTransition
:
withoutTransition
,
withoutTransition
:
withoutTransition
,
},
},
axis
=
c3_axis
(
$$
.
d3
,
axisParams
).
scale
(
scale
).
orient
(
orient
);
axis
=
c3_axis
(
$$
.
d3
,
axisParams
,
$$
).
scale
(
scale
).
orient
(
orient
);
if
(
$$
.
isTimeSeries
()
&&
tickValues
)
{
if
(
$$
.
isTimeSeries
()
&&
tickValues
)
{
tickValues
=
tickValues
.
map
(
function
(
v
)
{
return
$$
.
parseDate
(
v
);
});
tickValues
=
tickValues
.
map
(
function
(
v
)
{
return
$$
.
parseDate
(
v
);
});
...
@@ -4527,7 +4532,7 @@
...
@@ -4527,7 +4532,7 @@
};
};
c3_chart_internal_fn
.
getYAxis
=
function
(
scale
,
orient
,
tickFormat
,
tickValues
,
withOuterTick
)
{
c3_chart_internal_fn
.
getYAxis
=
function
(
scale
,
orient
,
tickFormat
,
tickValues
,
withOuterTick
)
{
var
axisParams
=
{
withOuterTick
:
withOuterTick
},
var
axisParams
=
{
withOuterTick
:
withOuterTick
},
axis
=
c3_axis
(
this
.
d3
,
axisParams
).
scale
(
scale
).
orient
(
orient
).
tickFormat
(
tickFormat
);
axis
=
c3_axis
(
this
.
d3
,
axisParams
,
this
).
scale
(
scale
).
orient
(
orient
).
tickFormat
(
tickFormat
);
if
(
this
.
isTimeSeriesY
())
{
if
(
this
.
isTimeSeriesY
())
{
axis
.
ticks
(
this
.
d3
.
time
[
this
.
config
.
axis_y_tick_time_value
],
this
.
config
.
axis_y_tick_time_interval
);
axis
.
ticks
(
this
.
d3
.
time
[
this
.
config
.
axis_y_tick_time_value
],
this
.
config
.
axis_y_tick_time_interval
);
}
else
{
}
else
{
...
@@ -4727,7 +4732,8 @@
...
@@ -4727,7 +4732,8 @@
};
};
c3_chart_internal_fn
.
getMaxTickWidth
=
function
()
{
c3_chart_internal_fn
.
getMaxTickWidth
=
function
()
{
return
10
;
return
(
this
.
config
.
maxTickTextWidth
||
this
.
config
.
default_tick_width
)
+
(
this
.
config
.
tick_text_padding
||
0
);
};
};
c3_chart_internal_fn
.
updateAxisLabels
=
function
(
withTransition
)
{
c3_chart_internal_fn
.
updateAxisLabels
=
function
(
withTransition
)
{
...
@@ -7988,7 +7994,8 @@
...
@@ -7988,7 +7994,8 @@
// 2. ceil values of translate/x/y to int for half pixel antialiasing
// 2. ceil values of translate/x/y to int for half pixel antialiasing
// 3. multiline tick text
// 3. multiline tick text
var
tickTextCharSize
;
var
tickTextCharSize
;
function
c3_axis
(
d3
,
params
)
{
// $$ is passed to save max tick width in $$.config
function
c3_axis
(
d3
,
params
,
$$
)
{
var
scale
=
d3
.
scale
.
linear
(),
orient
=
"bottom"
,
innerTickSize
=
6
,
outerTickSize
,
tickPadding
=
3
,
tickValues
=
null
,
tickFormat
,
tickArguments
;
var
scale
=
d3
.
scale
.
linear
(),
orient
=
"bottom"
,
innerTickSize
=
6
,
outerTickSize
,
tickPadding
=
3
,
tickValues
=
null
,
tickFormat
,
tickArguments
;
var
tickOffset
=
0
,
tickCulling
=
true
,
tickCentered
;
var
tickOffset
=
0
,
tickCulling
=
true
,
tickCentered
;
...
@@ -8143,6 +8150,29 @@
...
@@ -8143,6 +8150,29 @@
var
tickPosition
=
scale
(
d
)
+
(
tickCentered
?
0
:
tickOffset
);
var
tickPosition
=
scale
(
d
)
+
(
tickCentered
?
0
:
tickOffset
);
return
range
[
0
]
<
tickPosition
&&
tickPosition
<
range
[
1
]
?
innerTickSize
:
0
;
return
range
[
0
]
<
tickPosition
&&
tickPosition
<
range
[
1
]
?
innerTickSize
:
0
;
}
}
// Seek a specific value in the stylesheets of a document
function
getStyleValue
(
selector
,
property
)
{
var
css
,
rule
,
sheet
,
value
;
for
(
var
styleId
=
0
;
styleId
<
document
.
styleSheets
.
length
;
styleId
++
)
{
sheet
=
document
.
styleSheets
[
styleId
];
for
(
var
ruleId
=
0
;
ruleId
<
sheet
.
cssRules
.
length
;
ruleId
++
)
{
rule
=
sheet
.
cssRules
[
ruleId
];
css
=
rule
.
cssText
;
if
(
css
.
indexOf
(
selector
)
!==
-
1
)
{
if
(
css
.
indexOf
(
property
)
!==
-
1
)
{
try
{
value
=
css
.
split
(
property
)[
1
].
split
(
':'
)[
1
].
split
(
';'
)[
0
];
return
value
.
trim
();
}
catch
(
e
)
{
// Error will be caught in case of incorrect CSS
return
undefined
;
}
}
}
}
}
}
text
=
tick
.
select
(
"text"
);
text
=
tick
.
select
(
"text"
);
tspan
=
text
.
selectAll
(
'tspan'
)
tspan
=
text
.
selectAll
(
'tspan'
)
...
@@ -8150,12 +8180,24 @@
...
@@ -8150,12 +8180,24 @@
var
splitted
=
params
.
tickMultiline
?
splitTickText
(
d
,
params
.
tickWidth
)
:
[].
concat
(
textFormatted
(
d
));
var
splitted
=
params
.
tickMultiline
?
splitTickText
(
d
,
params
.
tickWidth
)
:
[].
concat
(
textFormatted
(
d
));
counts
[
i
]
=
splitted
.
length
;
counts
[
i
]
=
splitted
.
length
;
return
splitted
.
map
(
function
(
s
)
{
return
splitted
.
map
(
function
(
s
)
{
return
{
index
:
i
,
splitted
:
s
};
return
{
index
:
i
,
splitted
:
String
(
s
)
};
});
});
});
});
tspan
.
enter
().
append
(
'tspan'
);
tspan
.
enter
().
append
(
'tspan'
);
tspan
.
exit
().
remove
();
tspan
.
exit
().
remove
();
tspan
.
text
(
function
(
d
)
{
return
d
.
splitted
;
});
var
fontSize
;
tspan
.
text
(
function
(
d
)
{
fontSize
=
parseFloat
(
getStyleValue
(
'.c3-axis-y .tick'
,
'font-size'
));
if
(
d
.
splitted
.
length
)
{
$$
.
config
.
maxTickTextWidth
=
Math
.
max
(
$$
.
config
.
maxTickTextWidth
||
0
,
d
.
splitted
.
length
*
fontSize
/
$$
.
config
.
tick_text_h_to_w
);
}
return
d
.
splitted
;
});
switch
(
orient
)
{
switch
(
orient
)
{
case
"bottom"
:
case
"bottom"
:
...
...
c3.min.js
View file @
333a0293
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment