Skip to content

Commit d80ac33

Browse files
committed
Prepare for 1.6
remove scatter update versions Fixes #278
1 parent af4b510 commit d80ac33

File tree

15 files changed

+18
-820
lines changed

15 files changed

+18
-820
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ module.exports = function (grunt) {
113113
});
114114

115115
grunt.registerTask('default', ['concat', 'uglify', 'sed', 'copy']);
116-
grunt.registerTask('docs', ['default', 'emu', 'markdown', 'docco']);
116+
grunt.registerTask('docs', ['default', 'emu', 'markdown']);
117117
grunt.registerTask('web', ['docs', 'gh-pages']);
118118
grunt.registerTask('test', ['default', 'vows']);
119119
};

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dcjs",
3-
"version": "1.4.0",
3+
"version": "1.6.0",
44
"main": ["dc.js", "dc.css"],
55
"ignore": [
66
".gitignore",

dc.js

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* dc 1.6.0-dev
2+
* dc 1.6.0
33
* http://nickqizhu.github.io/dc.js/
44
* Copyright 2012 Nick Zhu and other contributors
55
*
@@ -20,7 +20,7 @@ dc = (function(){
2020
'use strict';
2121

2222
/**
23-
#### Version 1.6.0-dev
23+
#### Version 1.6.0
2424
2525
The entire dc.js library is scoped under **dc** name space. It does not introduce anything else into the global
2626
name space.
@@ -57,7 +57,7 @@ The API references will highlight the fact if a particular function is not chain
5757
5858
**/
5959
var dc = {
60-
version: "1.6.0-dev",
60+
version: "1.6.0",
6161
constants: {
6262
CHART_CLASS: "dc-chart",
6363
DEBUG_GROUP_CLASS: "debug",
@@ -5307,24 +5307,6 @@ dc.capped = function (_chart) {
53075307
return _chart;
53085308
};
53095309

5310-
dc.scatterPlot = function (parent, chartGroup) {
5311-
var _chart = dc.coordinateGridChart({});
5312-
5313-
_chart.plotData = function(){
5314-
_chart.chartBodyG().selectAll("path.dc-symbol")
5315-
.data(_chart.group().all())
5316-
.enter()
5317-
.append("path")
5318-
.attr("class", "dc-symbol")
5319-
.attr("transform", function(d){
5320-
return "translate("+_chart.x()(_chart.keyAccessor()(d))+","+_chart.y()(_chart.valueAccessor()(d))+")";
5321-
})
5322-
.attr("d", d3.svg.symbol());
5323-
};
5324-
5325-
return _chart.anchor(parent, chartGroup);
5326-
};
5327-
53285310
/**
53295311
## <a name="number-display" href="#number-display">#</a> Number Display [Concrete] < [Base Chart](#base-chart)
53305312
A display of a single numeric value.

dc.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dc.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dc",
3-
"version": "1.6.0-dev",
3+
"version": "1.6.0",
44
"license": "Apache-2.0",
55
"copyright": "2012",
66
"description": "A multi-dimensional charting library built to work natively with crossfilter and rendered using d3.js ",

src/scatter-plot.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/scatterplot-test.js

Lines changed: 0 additions & 57 deletions
This file was deleted.

web/docs/api-1.6.0-dev.md renamed to web/docs/api-1.6.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#### Version 1.6.0-dev
1+
#### Version 1.6.0
22

33
The entire dc.js library is scoped under **dc** name space. It does not introduce anything else into the global
44
name space.

web/docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
</style>
113113
</head>
114114
<body>
115-
<h4>Version 1.6.0-dev</h4>
115+
<h4>Version 1.6.0</h4>
116116
<p>The entire dc.js library is scoped under <strong>dc</strong> name space. It does not introduce anything else into the global
117117
name space.</p>
118118
<ul>

0 commit comments

Comments
 (0)