Merge branch 'hotfix/2.0'

.jscsrc

@@ -26,6 +26,5 @@
         "requireReturnTypes": true,
         "checkTypes": "capitalizedNativeCase",
         "checkRedundantAccess": true
-    },
-    "esnext": true
+    }
 }

.jshintrc

@@ -7,7 +7,7 @@
     "freeze": true,
     "immed": true,
     "indent": 4,
-    "latedef": true,
+    "latedef": false,
     "newcap": true,
     "noarg": true,
     "nonbsp": true,

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - '0.12'
+  - '6'
 script:
   - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then grunt ci; else grunt ci-pull; fi'
 env:

AUTHORS

@@ -85,3 +85,8 @@ Fil <fil@rezo.net>
 Mauricio Bustos <m@bustos.org>
 Anders Dalvander <github@dalvander.com>
 Alexander Stillesjö <a.stillesjo@gmail.com>
+Steffen Dienst <steffen.dienst@gmail.com>
+Ganesh Iyer <lastlegion@gmail.com>
+Daniel Gall <Daniel.Gall@noaa.gov>
+Renoth
+alexnb <abtmp-github@yahoo.com>

CONTRIBUTING.md

@@ -2,13 +2,17 @@
 
 ## Issue Submission Guidelines
 
-* Because of the volume of requests, we do not use the issue tracker for support questions. If you are trying to get a particular effect or you have a problem with your code, please ask your question on stackoverflow.com or the [user group](https://groups.google.com/forum/?fromgroups#!forum/dc-js-user-group)
-* It will be far, far easier for others to understand your problem or bug if you demonstrate it with a short example on http://jsfiddle.net/ or on http://bl.ocks.org/ (http://blockbuilder.org/ is a great way to edit bl.ocks!). Here are some examples you can fork to get started:
-  * [example jsFiddle](http://jsfiddle.net/gordonwoodhull/os27xcg2/) with some data and a chart.
-  * [blank jsFiddle](http://jsfiddle.net/gordonwoodhull/u57bfje8/) using the latest dc.js from github.io
+If you are trying to get a particular effect or you have a problem with your code, please ask your question [on stackoverflow.com](http://stackoverflow.com/questions/tagged/dc.js) or the [user group](https://groups.google.com/forum/?fromgroups#!forum/dc-js-user-group). We use the issue tracker for bug reports and feature requests only.
+
+Get help faster with a working example! Use [jsfiddle.net](http://jsfiddle.net) or [bl.ocks.org](http://bl.ocks.org) - [blockbuilder.org](http://blockbuilder.org/) is a great way to edit bl.ocks.
+
+Here are some examples you can fork to get started:
+  * [example jsFiddle](https://jsfiddle.net/gordonwoodhull/1hbjwxzy/) with some data and a chart.
+  * [blank jsFiddle](https://jsfiddle.net/gordonwoodhull/kk4j0bzn/) using the latest dc.js from github.io
   * the same example [as a bl.ock](http://bl.ocks.org/gordonwoodhull/ecce8e32d64c662cffd5); [on blockbuilder.org](http://blockbuilder.org/gordonwoodhull/ecce8e32d64c662cffd5)
   * a blank template bl.ock [on blockbuilder.org](http://blockbuilder.org/gordonwoodhull/9ab997c9a8d7d3380364)
-* For bugs and feature requests submit a [github issue](http://github.com/dc-js/dc.js/issues)
+
+For bug reports and feature requests submit a [github issue](http://github.com/dc-js/dc.js/issues)
   * Please include the version of DC you are using
   * If you can, please try the latest version of DC on the [master](https://raw.github.com/dc-js/dc.js/master/dc.js) branch to see if your issue has already been addressed or is otherwise affected by recent changes.
 
@@ -34,17 +38,7 @@
 * Please try to follow the existing code formatting
 * We use jshint and jscs to verify most of our coding conventions
 
-It helps keep on top of the conventions if you create a git pre-commit hook `.git/hooks/pre-commit`:
-```
-#!/usr/bin/env sh
-
-grunt jshint
-grunt jscs
-```
-
-(You also need to make it executable with  `chmod u+x .git/hooks/pre-commit`)
-
-Or you can just run the commands manually before committing.
+The default grunt task will install a git pre-commit hook `.git/hooks/pre-commit` to help verify the coding conventions. Or run `grunt lint` to check them manually.
 
 #### Testing Notes
 

Changelog.md

@@ -1,4 +1,22 @@
 # 2.0 Series
+## 2.0.0
+* xAxisPaddingUnit also applied to stacked charts, by Alexander Stillesjö ([#1234](https://github.com/dc-js/dc.js/pull/1234)
+* Limit zoom bounds - panning past the end should not cause brush to turn inside out. Thanks to Indri Muska for initial implementation and test ([#1026](https://github.com/dc-js/dc.js/pull/1026))
+* Legend was wrapping one item too late, by alexnb ([#1229](https://github.com/dc-js/dc.js/pull/1229))
+* Limit the number of legend items with `maxItems`, by Renoth ([#1114](https://github.com/dc-js/dc.js/pull/1114))
+* [Example of switching time intervals](http://dc-js.github.io/dc.js/examples/switching-time-intervals.html), for doing simple aggregation of simple time series data
+* Scatter plot titles, by Daniel Gall ([#1200](https://github.com/dc-js/dc.js/pull/1200))
+* `scatterPlot` and `RangedTwoDimensionalFilter` no longer require that the dimension key have exactly two elements, to support the common trick of putting the color in the third element.
+* [Scatter plot matrix brushing example](http://dc-js.github.io/dc.js/examples/splom.html)
+* `emptyOpacity` is exposed, and `emptySize` is a radius like the other sizes (squared for symbol size), by Ganesh Iyer ([#1058](https://github.com/dc-js/dc.js/pull/1058))
+* Bubble chart and heatmap correctly re-select (not selectAll) the sub-components in order to correctly apply new data when redrawn. This affects uses of dc.js where the data is replaced instead of being modified in place. (For example, the case where crossfilter is not used.) By Steffen Dienst and Matt Traynham. ([#1032](https://github.com/dc-js/dc.js/pull/1032), [#1237](https://github.com/dc-js/dc.js/pull/1237))
+* Further changed other unnecessary uses of `selectAll` to `select` - when appending or inserting a single element, one should almost always match that with `select` for updates. ([#1239](https://github.com/dc-js/dc.js/issues/1239))
+* Heatmap column/row filtering is a lot faster ([#649](https://github.com/dc-js/dc.js/issues/649))
+* `colorMixin.colorCalculator` properly documented and deprecated ([#1225](https://github.com/dc-js/dc.js/issues/1225))
+* Development dependencies upgraded, by Matt Traynham ([#1233](https://github.com/dc-js/dc.js/pull/1233))
+* Add a class diagram to the [HTML documentation](http://dc-js.github.io/dc.js/docs/html/).
+* Many documentation fixes. ([#612](https://github.com/dc-js/dc.js/issues/612), [#636](https://github.com/dc-js/dc.js/issues/636), [#1110](https://github.com/dc-js/dc.js/issues/1110), [#1224](https://github.com/dc-js/dc.js/issues/1224), [#1226](https://github.com/dc-js/dc.js/issues/1226), [#1228](https://github.com/dc-js/dc.js/issues/1228), [#1231](https://github.com/dc-js/dc.js/issues/1231), [#1235](https://github.com/dc-js/dc.js/issues/1235))
+
 ## 2.0.0 beta 33
 * Use Sass 3 (SCSS) for generating CSS, by Matt Traynham ([#1049](https://github.com/dc-js/dc.js/pull/1049))
 * Don't try to interpolate user data in label paths, by Alexander Stillesjö ([#1151](https://github.com/dc-js/dc.js/pull/1151))

Gruntfile.js

@@ -20,14 +20,25 @@ module.exports = function (grunt) {
         conf: config,
 
         concat: {
-            options: {
-                process: true,
-                sourceMap: true,
-                banner: '<%= conf.banner %>'
-            },
             js: {
                 src: '<%= conf.jsFiles %>',
-                dest: '<%= conf.pkg.name %>.js'
+                dest: '<%= conf.pkg.name %>.js',
+                options: {
+                    process: true,
+                    sourceMap: true,
+                    banner: '<%= conf.banner %>'
+                }
+            },
+            welcome: {
+                src: ['docs/welcome.base.md', 'web/img/class-hierarchy.svg'],
+                dest: 'welcome.md',
+                options: {
+                    process: function (src, filepath) {
+                        return /svg/.test(filepath) ?
+                            src.split('\n').slice(5).join('\n') :
+                            src;
+                    }
+                }
             }
         },
         sass: {
@@ -242,13 +253,14 @@ module.exports = function (grunt) {
         },
         docco: {
             options: {
-                dst: '<%= conf.web %>/docs',
-                basepath: '<%= conf.web %>'
+                dst: '<%= conf.web %>/docs'
             },
             howto: {
                 files: [
                     {
-                        src: ['<%= conf.web %>/stock.js']
+                        expand: true,
+                        cwd: '<%= conf.web %>',
+                        src: ['stock.js']
                     }
                 ]
             }
@@ -322,6 +334,20 @@ module.exports = function (grunt) {
                 files: [
                     {dest: '<%= conf.web %>/resizing/index.html', src: ['<%= conf.web %>/resizing/*.html']}
                 ]
+            },
+            'zoom-listing': {
+                options: {
+                    format: formatFileList,
+                    absolute: true,
+                    title: 'Index of dc.js zoom tests',
+                    heading: 'Interactive test for dc.js chart zoom',
+                    description: 'It\'s hard to conceive of a way to test zoom except by trying it. ' +
+                        'So this is a substitute for automated tests in this area',
+                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.web %>/zoom'
+                },
+                files: [
+                    {dest: '<%= conf.web %>/zoom/index.html', src: ['<%= conf.web %>/zoom/*.html']}
+                ]
             }
         },
 
@@ -358,6 +384,9 @@ module.exports = function (grunt) {
             hooks: {
                 command: 'cp -n scripts/pre-commit.sh .git/hooks/pre-commit' +
                     ' || echo \'Cowardly refusing to overwrite your existing git pre-commit hook.\''
+            },
+            hierarchy: {
+                command: 'dot -Tsvg -o web/img/class-hierarchy.svg class-hierarchy.dot'
             }
         },
         browserify: {

README.md

@@ -7,17 +7,39 @@
 dc.js
 =====
 
-Dimensional charting built to work natively with crossfilter rendered using d3.js. Check out the
-[example page](http://dc-js.github.com/dc.js/) with a quick five minutes how to guide. For a
-detailed [API reference](https://github.com/dc-js/dc.js/blob/master/web/docs/api-1.6.0.md) and
-more please visit the [Wiki](https://github.com/dc-js/dc.js/wiki).
+Dimensional charting built to work natively with [crossfilter](http://crossfilter.github.io/crossfilter/)
+rendered using [d3.js](https://d3js.org/). In dc.js, each chart displays an aggregation of some
+attributes through the position, size, and color of its elements, and also presents a dimension
+which can be filtered. When the filter or brush changes, all other charts are updated dynamically,
+using animated transitions.
 
+Check out the [example page](http://dc-js.github.com/dc.js/)
+and its [annotated source](http://dc-js.github.io/dc.js/docs/stock.html) for a quick five minute
+how-to guide. The detailed [API reference is here](http://dc-js.github.io/dc.js/docs/html/)
+([markdown version](https://github.com/dc-js/dc.js/blob/develop/web/docs/api-latest.md)). For
+more examples and hints please visit the [Wiki](https://github.com/dc-js/dc.js/wiki).
+
+
+Support
+--------------------
+* [Example Site](http://dc-js.github.com/dc.js/)
+* [Changelog](https://github.com/dc-js/dc.js/blob/develop/Changelog.md)
+* [Frequently Asked Questions](https://github.com/dc-js/dc.js/wiki/FAQ) and [Wiki](https://github.com/dc-js/dc.js/wiki)
+* [v2.0 API Reference](http://dc-js.github.io/dc.js/docs/html/) <sup>([markdown](https://github.com/dc-js/dc.js/blob/master/web/docs/api-latest.md))</sup> <sup>([next - v2.1](https://github.com/dc-js/dc.js/blob/develop/web/docs/api-latest.md))</sup> <sup>([last - v1.7](https://github.com/dc-js/dc.js/blob/master/web/docs/api-1.7.0.md))</sup>
+* [dc.js on StackOverflow](http://stackoverflow.com/questions/tagged/dc.js) - ask questions and get help
+* [User Group](https://groups.google.com/forum/?fromgroups#!forum/dc-js-user-group) ("mailing list") - discussion and longer topics
+* [GitHub Issues](https://github.com/dc-js/dc.js/issues) - bug reports and feature requests
+
+*Please direct questions and support requests to Stack Overflow or the user group. When posting to Stack Overflow, use the* `[dc.js]` *and/or* `[crossfilter]` *tags - other tags are likely to draw unwanted attention.*
+
+Get help faster with a working example! Fork these to get started:<br>
+[example jsFiddle](https://jsfiddle.net/gordonwoodhull/1hbjwxzy/) - [blank jsFiddle](https://jsfiddle.net/gordonwoodhull/kk4j0bzn/) - [example bl.ock](http://blockbuilder.org/gordonwoodhull/ecce8e32d64c662cffd5) - [blank bl.ock](http://blockbuilder.org/gordonwoodhull/9ab997c9a8d7d3380364)
 
 CDN location
 --------------------
 ```
-http://cdnjs.cloudflare.com/ajax/libs/dc/1.7.5/dc.min.js
-http://cdnjs.cloudflare.com/ajax/libs/dc/1.7.5/dc.min.css
+http://cdnjs.cloudflare.com/ajax/libs/dc/2.0.0/dc.min.js
+http://cdnjs.cloudflare.com/ajax/libs/dc/2.0.0/dc.min.css
 ```
 Please do not use github.io as a CDN unless you need the bleeding-edge features.
 

class-hierarchy.dot

@@ -0,0 +1,34 @@
+digraph dcHierarchy {
+graph [rankdir=LR, ranksep=0.5]
+node [fontname="sans-serif", fontsize=10, margin="0.05,0.05", href="dc.\N.html"]
+node [style=filled, fillcolor=lightgreen]
+{ node [style=filled, fillcolor=lightblue] baseMixin colorMixin marginMixin bubbleMixin coordinateGridMixin stackMixin capMixin }
+baseMixin [href="dc.baseMixin.html"]
+colorMixin -> coordinateGridMixin
+marginMixin -> coordinateGridMixin
+coordinateGridMixin -> stackMixin
+stackMixin -> barChart
+coordinateGridMixin -> boxPlot
+coordinateGridMixin -> bubbleChart
+bubbleMixin -> bubbleChart
+baseMixin -> bubbleMixin
+bubbleMixin -> bubbleOverlay
+coordinateGridMixin -> compositeChart
+baseMixin -> dataCount
+baseMixin -> dataGrid
+baseMixin -> dataTable
+baseMixin -> colorMixin
+colorMixin -> geoChoroplethChart
+baseMixin -> marginMixin
+marginMixin -> heatMap
+colorMixin -> heatMap
+stackMixin -> lineChart
+baseMixin -> numberDisplay
+colorMixin -> pieChart
+baseMixin -> capMixin
+capMixin -> pieChart
+capMixin -> rowChart
+marginMixin -> rowChart
+colorMixin -> rowChart
+coordinateGridMixin -> scatterPlot
+}

component.json

@@ -2,7 +2,7 @@
   "name": "dc.js",
   "repository": "dc-js/dc.js",
   "description": "Multi-Dimensional charting built to work natively with crossfilter rendered with d3.js",
-  "version": "2.0.0-beta.32",
+  "version": "2.0.0",
   "keywords": [
     "visualization",
     "svg",