Skip to content

Commit 45659f4

Browse files
fix d3v3 links
fixes #1231
1 parent e590e48 commit 45659f4

18 files changed

+72
-74
lines changed

src/bar-chart.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ dc.barChart = function (parent, chartGroup) {
249249
/**
250250
* Get or set the spacing between bars as a fraction of bar size. Valid values are between 0-1.
251251
* Setting this value will also remove any previously set {@link dc.barChart#gap gap}. See the
252-
* {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales#wiki-ordinal_rangeBands d3 docs}
252+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md#ordinal_rangeBands d3 docs}
253253
* for a visual description of how the padding is applied.
254254
* @method barPadding
255255
* @memberof dc.barChart

src/base-mixin.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ dc.baseMixin = function (_chart) {
211211
/**
212212
* **mandatory**
213213
*
214-
* Set or get the dimension attribute of a chart. In `dc`, a dimension can be any valid [crossfilter
215-
* dimension](https://github.com/square/crossfilter/wiki/API-Reference#wiki-dimension).
214+
* Set or get the dimension attribute of a chart. In `dc`, a dimension can be any valid
215+
* {@link https://github.com/square/crossfilter/wiki/API-Reference#wiki-dimension crossfilter dimension}
216216
*
217217
* If a value is given, then it will be used as the new dimension. If no value is specified then
218218
* the current dimension will be returned.
@@ -353,10 +353,10 @@ dc.baseMixin = function (_chart) {
353353
* @method select
354354
* @memberof dc.baseMixin
355355
* @instance
356-
* @see {@link https://github.com/mbostock/d3/wiki/Selections d3.selection}
356+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Selections.md#d3_select d3.select}
357357
* @example
358-
* // Similar to:
359-
* d3.select('#chart-id').select(selector);
358+
* // Has the same effect as d3.select('#chart-id').select(selector)
359+
* chart.select(selector)
360360
* @returns {d3.selection}
361361
*/
362362
_chart.select = function (s) {
@@ -371,10 +371,10 @@ dc.baseMixin = function (_chart) {
371371
* @method selectAll
372372
* @memberof dc.baseMixin
373373
* @instance
374-
* @see {@link https://github.com/mbostock/d3/wiki/Selections d3.selection}
374+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Selections.md#d3_selectAll d3.selectAll}
375375
* @example
376-
* // Similar to:
377-
* d3.select('#chart-id').selectAll(selector);
376+
* // Has the same effect as d3.select('#chart-id').selectAll(selector)
377+
* chart.selectAll(selector)
378378
* @returns {d3.selection}
379379
*/
380380
_chart.selectAll = function (s) {
@@ -1492,7 +1492,7 @@ dc.baseMixin = function (_chart) {
14921492
* @method on
14931493
* @memberof dc.baseMixin
14941494
* @instance
1495-
* @see {@link https://github.com/mbostock/d3/wiki/Internals#dispatch_on d3.dispatch.on}
1495+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Internals.md#dispatch_on d3.dispatch.on}
14961496
* @example
14971497
* .on('renderlet', function(chart, filter){...})
14981498
* .on('pretransition', function(chart, filter){...})

src/box-plot.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ dc.boxPlot = function (parent, chartGroup) {
7474

7575
/**
7676
* Get or set the spacing between boxes as a fraction of box size. Valid values are within 0-1.
77-
* See the {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales#wiki-ordinal_rangeBands d3 docs}
77+
* See the {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md#ordinal_rangeBands d3 docs}
7878
* for a visual description of how the padding is applied.
7979
* @method boxPadding
8080
* @memberof dc.boxPlot
8181
* @instance
82-
* @see {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales#wiki-ordinal_rangeBands d3.scale.ordinal.rangeBands}
82+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md#ordinal_rangeBands d3.scale.ordinal.rangeBands}
8383
* @param {Number} [padding=0.8]
8484
* @returns {Number|dc.boxPlot}
8585
*/

src/bubble-mixin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ dc.bubbleMixin = function (_chart) {
3131

3232
/**
3333
* Get or set the bubble radius scale. By default the bubble chart uses
34-
* {@link https://github.com/mbostock/d3/wiki/Quantitative-Scales#linear d3.scale.linear().domain([0, 100])}
34+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Quantitative-Scales.md#linear d3.scale.linear().domain([0, 100])}
3535
* as its radius scale.
3636
* @method r
3737
* @memberof dc.bubbleMixin
3838
* @instance
39-
* @see {@link http://github.com/mbostock/d3/wiki/Scales d3.scale}
39+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Scales.md d3.scale}
4040
* @param {d3.scale} [bubbleRadiusScale=d3.scale.linear().domain([0, 100])]
4141
* @returns {d3.scale|dc.bubbleMixin}
4242
*/

src/color-mixin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dc.colorMixin = function (_chart) {
1919
* @method colors
2020
* @memberof dc.colorMixin
2121
* @instance
22-
* @see {@link http://github.com/mbostock/d3/wiki/Scales d3.scale}
22+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Scales.md d3.scale}
2323
* @example
2424
* // alternate categorical scale
2525
* chart.colors(d3.scale.category20b());
@@ -46,7 +46,7 @@ dc.colorMixin = function (_chart) {
4646

4747
/**
4848
* Convenience method to set the color scale to
49-
* {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales#ordinal d3.scale.ordinal} with
49+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md#ordinal d3.scale.ordinal} with
5050
* range `r`.
5151
* @method ordinalColors
5252
* @memberof dc.colorMixin

src/composite-chart.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ dc.compositeChart = function (parent, chartGroup) {
384384
* @method rightY
385385
* @memberof dc.compositeChart
386386
* @instance
387-
* @see {@link https://github.com/mbostock/d3/wiki/Scales d3.scale}
387+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Scales.md d3.scale}
388388
* @param {d3.scale} [yScale]
389389
* @returns {d3.scale|dc.compositeChart}
390390
*/
@@ -508,15 +508,15 @@ dc.compositeChart = function (parent, chartGroup) {
508508
/**
509509
* Set or get the right y axis used by the composite chart. This function is most useful when y
510510
* axis customization is required. The y axis in dc.js is an instance of a [d3 axis
511-
* object](https://github.com/mbostock/d3/wiki/SVG-Axes#wiki-_axis) therefore it supports any valid
511+
* object](https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#axis) therefore it supports any valid
512512
* d3 axis manipulation.
513513
*
514514
* **Caution**: The y axis is usually generated internally by dc; resetting it may cause
515515
* unexpected results.
516516
* @method rightYAxis
517517
* @memberof dc.compositeChart
518518
* @instance
519-
* @see {@link https://github.com/mbostock/d3/wiki/SVG-Axes d3.svg.axis}
519+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#axis d3.svg.axis}
520520
* @example
521521
* // customize y axis tick format
522522
* chart.rightYAxis().tickFormat(function (v) {return v + '%';});

src/coordinate-grid-mixin.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,12 @@ dc.coordinateGridMixin = function (_chart) {
258258
* **mandatory**
259259
*
260260
* Get or set the x scale. The x scale can be any d3
261-
* {@link https://github.com/mbostock/d3/wiki/Quantitative-Scales quantitive scale} or
262-
* {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales ordinal scale}.
261+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Quantitative-Scales.md quantitive scale} or
262+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md ordinal scale}.
263263
* @method x
264264
* @memberof dc.coordinateGridMixin
265265
* @instance
266-
* @see {@link http://github.com/mbostock/d3/wiki/Scales d3.scale}
266+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Scales.md d3.scale}
267267
* @example
268268
* // set x to a linear scale
269269
* chart.x(d3.scale.linear().domain([-2500, 2500]))
@@ -292,7 +292,7 @@ dc.coordinateGridMixin = function (_chart) {
292292
* number of dots for a line chart. This function is expected to return a Javascript array of all
293293
* data points on x axis, or the number of points on the axis. [d3 time range functions
294294
* d3.time.days, d3.time.months, and
295-
* d3.time.years](https://github.com/mbostock/d3/wiki/Time-Intervals#aliases) are all valid xUnits
295+
* d3.time.years](https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Intervals.md#aliases) are all valid xUnits
296296
* function. dc.js also provides a few units function, see the {@link dc.units Units Namespace} for
297297
* a list of built-in units functions.
298298
* @method xUnits
@@ -329,15 +329,15 @@ dc.coordinateGridMixin = function (_chart) {
329329

330330
/**
331331
* Set or get the x axis used by a particular coordinate grid chart instance. This function is most
332-
* useful when x axis customization is required. The x axis in dc.js is an instance of a [d3
333-
* axis object](https://github.com/mbostock/d3/wiki/SVG-Axes#wiki-axis); therefore it supports any
334-
* valid d3 axis manipulation.
332+
* useful when x axis customization is required. The x axis in dc.js is an instance of a
333+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#axis d3 axis object};
334+
* therefore it supports any valid d3 axis manipulation.
335335
*
336336
* **Caution**: The x axis is usually generated internally by dc; resetting it may cause unexpected results.
337337
* @method xAxis
338338
* @memberof dc.coordinateGridMixin
339339
* @instance
340-
* @see {@link http://github.com/mbostock/d3/wiki/SVG-Axes d3.svg.axis}
340+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#axis d3.svg.axis}
341341
* @example
342342
* // customize x axis tick format
343343
* chart.xAxis().tickFormat(function(v) {return v + '%';});
@@ -759,7 +759,7 @@ dc.coordinateGridMixin = function (_chart) {
759759
* @method y
760760
* @memberof dc.coordinateGridMixin
761761
* @instance
762-
* @see {@link http://github.com/mbostock/d3/wiki/Scales d3.scale}
762+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Scales.md d3.scale}
763763
* @param {d3.scale} [yScale]
764764
* @returns {d3.scale|dc.coordinateGridMixin}
765765
*/
@@ -775,14 +775,14 @@ dc.coordinateGridMixin = function (_chart) {
775775
/**
776776
* Set or get the y axis used by the coordinate grid chart instance. This function is most useful
777777
* when y axis customization is required. The y axis in dc.js is simply an instance of a [d3 axis
778-
* object](https://github.com/mbostock/d3/wiki/SVG-Axes#wiki-_axis); therefore it supports any
778+
* object](https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#axis); therefore it supports any
779779
* valid d3 axis manipulation.
780780
*
781781
* **Caution**: The y axis is usually generated internally by dc; resetting it may cause unexpected results.
782782
* @method yAxis
783783
* @memberof dc.coordinateGridMixin
784784
* @instance
785-
* @see {@link http://github.com/mbostock/d3/wiki/SVG-Axes d3.svg.axis}
785+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/SVG-Axes.md#axis d3.svg.axis}
786786
* @example
787787
* // customize y axis tick format
788788
* chart.yAxis().tickFormat(function(v) {return v + '%';});

src/core.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,12 @@ dc.units.integers = function (start, end) {
355355
/**
356356
* This argument can be passed to the {@link dc.coordinateGridMixin#xUnits .xUnits} function of the to
357357
* specify ordinal units for the x axis. Usually this parameter is used in combination with passing
358-
* {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales d3.scale.ordinal} to
358+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md d3.scale.ordinal} to
359359
* {@link dc.coordinateGridMixin#x .x}.
360360
* It just returns the domain passed to it, which for ordinal charts is an array of all values.
361361
* @method ordinal
362362
* @memberof dc.units
363-
* @see {@link https://github.com/mbostock/d3/wiki/Ordinal-Scales d3.scale.ordinal}
363+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Ordinal-Scales.md d3.scale.ordinal}
364364
* @see {@link dc.coordinateGridMixin#xUnits coordinateGridMixin.xUnits}
365365
* @see {@link dc.coordinateGridMixin#x coordinateGridMixin.x}
366366
* @example

src/data-count.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dc.dataCount = function (parent, chartGroup) {
6969
* @method formatNumber
7070
* @memberof dc.dataCount
7171
* @instance
72-
* @see {@link https://github.com/mbostock/d3/wiki/Formatting d3.format}
72+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md d3.format}
7373
* @example
7474
* counter.formatNumber(d3.format('.2g'))
7575
* @param {Function} [formatter=d3.format('.2g')]

src/data-grid.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* a simple way to define how the items are displayed.
44
*
55
* Note: Unlike other charts, the data grid chart (and data table) use the {@link dc.dataGrid#group group} attribute as a keying function
6-
* for {@link https://github.com/mbostock/d3/wiki/Arrays#-nest nesting} the data together in groups.
6+
* for {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Arrays.md#nest nesting} the data together in groups.
77
* Do not pass in a crossfilter group as this will not work.
88
*
99
* Examples:
@@ -234,8 +234,8 @@ dc.dataGrid = function (parent, chartGroup) {
234234
* @method order
235235
* @memberof dc.dataGrid
236236
* @instance
237-
* @see {@link https://github.com/mbostock/d3/wiki/Arrays#d3_ascending d3.ascending}
238-
* @see {@link https://github.com/mbostock/d3/wiki/Arrays#d3_descending d3.descending}
237+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Arrays.md#d3_ascending d3.ascending}
238+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Arrays.md#d3_descending d3.descending}
239239
* @example
240240
* chart.order(d3.descending);
241241
* @param {Function} [order=d3.ascending]

src/data-table.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* filtered) in a good old tabular fashion.
44
*
55
* Note: Unlike other charts, the data table (and data grid chart) use the {@link dc.dataTable#group group} attribute as a
6-
* keying function for {@link https://github.com/mbostock/d3/wiki/Arrays#-nest nesting} the data
6+
* keying function for {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Arrays.md#nest nesting} the data
77
* together in groups. Do not pass in a crossfilter group as this will not work.
88
*
99
* Another interesting feature of the data table is that you can pass a crossfilter group to the `dimension`, as
@@ -388,8 +388,8 @@ dc.dataTable = function (parent, chartGroup) {
388388
* @method order
389389
* @memberof dc.dataTable
390390
* @instance
391-
* @see {@link https://github.com/mbostock/d3/wiki/Arrays#d3_ascending d3.ascending}
392-
* @see {@link https://github.com/mbostock/d3/wiki/Arrays#d3_descending d3.descending}
391+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Arrays.md#d3_ascending d3.ascending}
392+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Arrays.md#d3_descending d3.descending}
393393
* @example
394394
* chart.order(d3.descending);
395395
* @param {Function} [order=d3.ascending]

src/geo-choropleth-chart.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ dc.geoChoroplethChart = function (parent, chartGroup) {
183183
* @memberof dc.geoChoroplethChart
184184
* @instance
185185
* @see {@link http://geojson.org/ GeoJSON}
186-
* @see {@link https://github.com/mbostock/topojson/wiki TopoJSON}
187-
* @see {@link https://github.com/mbostock/topojson/wiki/API-Reference#feature topojson.feature}
186+
* @see {@link https://github.com/topojson/topojson/wiki TopoJSON}
187+
* @see {@link https://github.com/topojson/topojson/wiki/API-Reference#feature topojson.feature}
188188
* @example
189189
* // insert a layer for rendering US states
190190
* chart.overlayGeoJson(statesJson.features, 'state', function(d) {
@@ -209,12 +209,12 @@ dc.geoChoroplethChart = function (parent, chartGroup) {
209209
};
210210

211211
/**
212-
* Set custom geo projection function. See the available [d3 geo projection
213-
* functions](https://github.com/mbostock/d3/wiki/Geo-Projections).
212+
* Set custom geo projection function. See the available
213+
* {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Geo-Projections.md d3 geo projection functions}.
214214
* @method projection
215215
* @memberof dc.geoChoroplethChart
216216
* @instance
217-
* @see {@link https://github.com/mbostock/d3/wiki/Geo-Projections d3.geo.projection}
217+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Geo-Projections.md d3.geo.projection}
218218
* @see {@link https://github.com/d3/d3-geo-projection Extended d3.geo.projection}
219219
* @param {d3.projection} [projection=d3.geo.albersUsa()]
220220
* @returns {dc.geoChoroplethChart}
@@ -239,13 +239,13 @@ dc.geoChoroplethChart = function (parent, chartGroup) {
239239
};
240240

241241
/**
242-
* Returns the {@link https://github.com/mbostock/d3/wiki/Geo-Paths#path d3.geo.path} object used to
242+
* Returns the {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Geo-Paths.md#path d3.geo.path} object used to
243243
* render the projection and features. Can be useful for figuring out the bounding box of the
244244
* feature set and thus a way to calculate scale and translation for the projection.
245245
* @method geoPath
246246
* @memberof dc.geoChoroplethChart
247247
* @instance
248-
* @see {@link https://github.com/mbostock/d3/wiki/Geo-Paths#path d3.geo.path}
248+
* @see {@link https://github.com/d3/d3-3.x-api-reference/blob/master/Geo-Paths.md#path d3.geo.path}
249249
* @returns {d3.geo.path}
250250
*/
251251
_chart.geoPath = function () {

0 commit comments

Comments
 (0)