vitalif-js
/
dimple
mirror of https://github.com/vitalif/dimple
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #179 from rebaselabs/bug/circle_marker 

Bug/circle marker
master
John Kiernander 2015-09-01 17:18:57 +01:00
parent 308c1a5049 fd08ad739e
commit 7094c77b97
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/dimple.latest.js vendored
View File

@ -1145,7 +1145,6 @@
};
// Copyright: 2015 AlignAlytics
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
// Source: /src/objects/chart/methods/_getDelay.js
@ -1610,6 +1609,7 @@
tooltipLabel: 'dimple-custom-tooltip-label',
tooltipDropLine: 'dimple-custom-tooltip-dropline',
lineMarker: 'dimple-custom-line-marker',
lineMarkerCircle: 'dimple-custom-line-marker-circle',
legendLabel: 'dimple-custom-legend-label',
legendKey: 'dimple-custom-legend-key',
areaSeries: 'dimple-custom-series-area',
@ -1631,6 +1631,7 @@
'dimple-custom-format-10'
]
};
// Copyright: 2015 AlignAlytics
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
// Source: /src/objects/chart/methods/defaultColors.js
@ -5238,6 +5239,7 @@
// Add a ring around the data point
chart._tooltipGroup.append("circle")
.attr("class", "dimple-line-marker-circle " + chart.customClassList.lineMarkerCircle)
.attr("cx", cx)
.attr("cy", cy)
.attr("r", r)

4
dist/dimple.latest.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/dimple.v2.1.6.js vendored
View File

@ -1145,7 +1145,6 @@
};
// Copyright: 2015 AlignAlytics
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
// Source: /src/objects/chart/methods/_getDelay.js
@ -1610,6 +1609,7 @@
tooltipLabel: 'dimple-custom-tooltip-label',
tooltipDropLine: 'dimple-custom-tooltip-dropline',
lineMarker: 'dimple-custom-line-marker',
lineMarkerCircle: 'dimple-custom-line-marker-circle',
legendLabel: 'dimple-custom-legend-label',
legendKey: 'dimple-custom-legend-key',
areaSeries: 'dimple-custom-series-area',
@ -1631,6 +1631,7 @@
'dimple-custom-format-10'
]
};
// Copyright: 2015 AlignAlytics
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
// Source: /src/objects/chart/methods/defaultColors.js
@ -5238,6 +5239,7 @@
// Add a ring around the data point
chart._tooltipGroup.append("circle")
.attr("class", "dimple-line-marker-circle " + chart.customClassList.lineMarkerCircle)
.attr("cx", cx)
.attr("cy", cy)
.attr("r", r)

4
dist/dimple.v2.1.6.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/methods/_showPointTooltip.js
View File

@ -47,6 +47,7 @@
// Add a ring around the data point
chart._tooltipGroup.append("circle")
.attr("class", "dimple-line-marker-circle " + chart.customClassList.lineMarkerCircle)
.attr("cx", cx)
.attr("cy", cy)
.attr("r", r)

3
src/objects/chart/methods/customClassList.js
View File

@ -10,6 +10,7 @@
tooltipLabel: 'dimple-custom-tooltip-label',
tooltipDropLine: 'dimple-custom-tooltip-dropline',
lineMarker: 'dimple-custom-line-marker',
lineMarkerCircle: 'dimple-custom-line-marker-circle',
legendLabel: 'dimple-custom-legend-label',
legendKey: 'dimple-custom-legend-key',
areaSeries: 'dimple-custom-series-area',
@ -30,4 +31,4 @@
'dimple-custom-format-9',
'dimple-custom-format-10'
]
};
};