Propagate elasticX to child charts of composite

fixes dc-js#926 elasticX not working for series chart
tttp · May 18, 2015 · f31f830 · f31f830
1 parent 0555687
commit f31f830
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 21 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,7 @@
 # 2.0 Series
+## 2.0.0 beta 9
+ * propagate elasticX to child charts so that domain can be calculated correctly ([#926](https://github.com/dc-js/dc.js/issues/926))
+
 ## 2.0.0 beta 8
  * simplify Gruntfile and further update dependencies, by Matt Traynham ([#849](https://github.com/dc-js/dc.js/pull/849))
  * setting the chart group should automatically put the chart in that group, by Matt Traynham ([#834](https://github.com/dc-js/dc.js/pull/834) / [#775](https://github.com/dc-js/dc.js/issues/775))

diff --git a/dc.js b/dc.js
diff --git a/dc.js.map b/dc.js.map
diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dc",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "license": "Apache-2.0",
   "copyright": "2014",
   "description": "A multi-dimensional charting library built to work natively with crossfilter and rendered using d3.js ",

diff --git a/src/composite-chart.js b/src/composite-chart.js
@@ -69,6 +69,7 @@ dc.compositeChart = function (parent, chartGroup) {
             child.transitionDuration(_chart.transitionDuration());
             child.brushOn(_chart.brushOn());
             child.renderTitle(_chart.renderTitle());
+            child.elasticX(_chart.elasticX());
         }
 
         return g;

diff --git a/web/docs/api-latest.md b/web/docs/api-latest.md
@@ -27,7 +27,7 @@
   * [Heat Map](#heat-map)
   * [Box Plot](#box-plot)
 
-#### Version 2.0.0-beta.8
+#### Version 2.0.0-beta.9
 The entire dc.js library is scoped under the **dc** name space. It does not introduce anything else
 into the global name space.
 #### Function Chaining

diff --git a/web/docs/index.html b/web/docs/index.html
@@ -142,7 +142,7 @@ <h1 id="dc-api">DC API</h1>
 <li><a href="#heat-map">Heat Map</a></li>
 <li><a href="#box-plot">Box Plot</a></li>
 </ul>
-<h4 id="version-2-0-0-beta-8">Version 2.0.0-beta.8</h4>
+<h4 id="version-2-0-0-beta-9">Version 2.0.0-beta.9</h4>
 <p>The entire dc.js library is scoped under the <strong>dc</strong> name space. It does not introduce anything else
 into the global name space.</p>
 <h4 id="function-chaining">Function Chaining</h4>

diff --git a/web/js/dc.js b/web/js/dc.js
diff --git a/web/js/dc.js.map b/web/js/dc.js.map
diff --git a/web/js/dc.min.js b/web/js/dc.min.js
diff --git a/web/js/dc.min.js.map b/web/js/dc.min.js.map