Merge branch 'hotfix/2.0.0-beta.19'

Author: gordonwoodhull

AUTHORS

@@ -65,3 +65,4 @@ Jonathan Munz <jonathan.munz@upsight.com>
 Chris Alvino <alvino.chris@gmail.com>
 Emiliano Guevara <emiliano@opoint.com>
 Wang Xuan <wangxuan927@gmail.com>
+Ethan Jewett <esjewett@gmail.com>

Changelog.md

@@ -1,10 +1,23 @@
 # 2.0 Series
+## 2.0.0 beta 19
+* Allow d3.selection to be passed as parent, as documented ([#1006](https://github.com/dc-js/dc.js/issues/1006))
+* Properly derive dc.errors from Error prototype to get stack
+* Add BadArgumentException and make .anchor() parent argument mandatory
+* Enable crossfilter optimizations by not resetting the filter and by using filterExact and filterRange, by Ethan Jewett ([#990](https://github.com/dc-js/dc.js/pull/990) / [#989](https://github.com/dc-js/dc.js/issues/989) / [#478](https://github.com/dc-js/dc.js/issues/478))
+* Add `filterType` to dc.filters, for filter optimizations and [easier serialization](https://github.com/dc-js/dc.js/issues/819)
+* More documentation improvements, by Matt Traynham ([#999](https://github.com/dc-js/dc.js/pull/999))
+* Fix method name in documentation ([#1009](https://github.com/dc-js/dc.js/issues/1009))
+* Move x axis when row chart size changes, by Wang Xuan ([#1001](https://github.com/dc-js/dc.js/pull/1001)
+* Fix css rule that was improperly selecting all axes, not just dc.js ones ([#1011](https://github.com/dc-js/dc.js/pull/1011) / ([#1005](https://github.com/dc-js/dc.js/issues/1007))
+* Add pre-commit hook to hopefully avoid ever checking in merge artifacts again.
+
 ## 2.0.0 beta 18
 * Fixes resizing examples to use `rescale` - currently all coordinate grid charts need to call this when changing width/height, in order to get axes moved ([#974](https://github.com/dc-js/dc.js/issues/974))
 * Update all dependencies, continued linting, by Matt Traynham ([#975](https://github.com/dc-js/dc.js/pull/975))
 * Bubble mixin minimum radius accessor ([#687](https://github.com/dc-js/dc.js/issues/687))
 * Example of single selection of ordinal bar chart (for [#996](https://github.com/dc-js/dc.js/issues/996))
 * Move documentation to JSDoc toolchain, by Matt Traynham ([#978](https://github.com/dc-js/dc.js/pull/978) / [#994](https://github.com/dc-js/dc.js/pull/994))
+* Resize heat map axes when chart size changes, by Wang Xuan ([#995](https://github.com/dc-js/dc.js/pull/995)
 
 ## 2.0.0 beta 17
 * Fixes issue where transitions were applied to the brush as it's being applied, causing it to lag ([#973](https://github.com/dc-js/dc.js/issues/973))

Gruntfile.js

@@ -74,7 +74,7 @@ module.exports = function (grunt) {
         watch: {
             jsdoc2md: {
                 files: ['<%= conf.src %>/**/*.js'],
-                tasks: ['jsdoc2md']
+                tasks: ['build', 'jsdoc2md']
             },
             scripts: {
                 files: ['<%= conf.src %>/**/*.js', '<%= conf.web %>/stock.js'],
@@ -350,14 +350,14 @@ module.exports = function (grunt) {
     grunt.registerTask('docs', ['build', 'copy', 'jsdoc2md', 'docco', 'fileindex']);
     grunt.registerTask('web', ['docs', 'gh-pages']);
     grunt.registerTask('server', ['docs', 'fileindex', 'jasmine:specs:build', 'connect:server', 'watch:jasmine-docs']);
-    grunt.registerTask('test', ['build', 'jasmine:specs', 'shell:hooks']);
+    grunt.registerTask('test', ['build', 'jasmine:specs']);
     grunt.registerTask('test-browserify', ['build', 'browserify', 'jasmine:browserify']);
     grunt.registerTask('coverage', ['build', 'jasmine:coverage']);
     grunt.registerTask('ci', ['test', 'jasmine:specs:build', 'connect:server', 'saucelabs-jasmine']);
     grunt.registerTask('ci-pull', ['test', 'jasmine:specs:build', 'connect:server']);
     grunt.registerTask('lint', ['jshint', 'jscs']);
-    grunt.registerTask('default', ['build']);
-    grunt.registerTask('jsdoc', ['jsdoc2md', 'watch:jsdoc2md']);
+    grunt.registerTask('default', ['build', 'shell:hooks']);
+    grunt.registerTask('jsdoc', ['build', 'jsdoc2md', 'watch:jsdoc2md']);
 };
 
 module.exports.jsFiles = [

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.18",
+  "version": "2.0.0-beta.19",
   "keywords": [
     "visualization",
     "svg",

dc.css

@@ -65,7 +65,8 @@ div.dc-chart {
     fill: #ccc;
 }
 
-.dc-chart .axis path, .axis line {
+.dc-chart .axis path,
+.dc-chart .axis line {
     fill: none;
     stroke: #000;
     shape-rendering: crispEdges;
@@ -253,7 +254,8 @@ div.dc-chart {
     stroke-opacity: 0.2;
 }
 
-.dc-chart path.dc-symbol, g.dc-legend-item.fadeout {
+.dc-chart path.dc-symbol,
+g.dc-legend-item.fadeout {
     fill-opacity: 0.5;
     stroke-opacity: 0.5;
 }