Merge branch 'release/2.1.1'

luckyluc74 · Jan 13, 2017 · 0af6292 · 0af6292
2 parents b1bdcf8 + e43ee8f
commit 0af6292
Show file tree

Hide file tree

Showing 18 changed files with 99 additions and 25 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -90,4 +90,5 @@ Steffen Dienst <steffen.dienst@gmail.com>
 Ganesh Iyer <lastlegion@gmail.com>
 Daniel Gall <Daniel.Gall@noaa.gov>
 Renoth
-alexnb <abtmp-github@yahoo.com>
+Alexander Bouriakov <abtmp-github@yahoo.com>
+Kyle Doherty <kyle.l.doherty@gmail.com>
diff --git a/Changelog.md b/Changelog.md
@@ -5,6 +5,9 @@
  * Functional-style filter handlers: instead of modifying the array of filters in-place, filter handlers must return the new filter array. This is consistent with the old documention, but a different implementation: any changes to the `filters` argument will be ignored unless they are returned. This should make filter handlers easier to reason about.
 
 # 2.0 Series
+## 2.0.1
+* `sans-serif` was specified as a string, which is invalid, by Kyle Doherty ([#1260](https://github.com/dc-js/dc.js/pull/1260))
+
 ## 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))

diff --git a/component.json b/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.1.0-dev",
+  "version": "2.1.1",
   "keywords": [
     "visualization",
     "svg",

diff --git a/dc.css b/dc.css
@@ -46,7 +46,7 @@ div.dc-chart {
   shape-rendering: crispEdges; }
 
 .dc-chart .axis text {
-  font: 10px "sans-serif"; }
+  font: 10px sans-serif; }
 
 .dc-chart .grid-line, .dc-chart .axis .grid-line, .dc-chart .grid-line line, .dc-chart .axis .grid-line line {
   fill: none;
@@ -143,7 +143,7 @@ div.dc-chart {
   stroke-opacity: 0.2; }
 
 .dc-chart .box text {
-  font: 10px "sans-serif";
+  font: 10px sans-serif;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -khtml-user-select: none;

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,8 +1,8 @@
 {
   "name": "dc",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "Apache-2.0",
-  "copyright": "2016",
+  "copyright": "2017",
   "description": "A multi-dimensional charting library built to work natively with crossfilter and rendered using d3.js ",
   "keywords": [
     "visualization",

diff --git a/src/cap-mixin.js b/src/cap-mixin.js
@@ -67,6 +67,20 @@ dc.capMixin = function (_chart) {
      * Get or set the count of elements to that will be included in the cap. If there is an
      * {@link dc.capMixin#othersGrouper othersGrouper}, any further elements will be combined in an
      * extra element with its name determined by {@link dc.capMixin#othersLabel othersLabel}.
+     *
+     * Up through dc.js 2.0.*, capping uses
+     * {@link https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_top group.top(N)},
+     * which selects the largest items according to
+     * {@link https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_order group.order()}.
+     * The chart then sorts the items according to {@link dc.baseMixin#ordering baseMixin.ordering()}.
+     * So the two values essentially have to agree, but if the former is incorrect (it's easy to
+     * forget about `group.order()`), the latter will mask the problem. This also makes
+     * {@link https://github.com/dc-js/dc.js/wiki/FAQ#fake-groups fake groups} difficult to
+     * implement.
+     *
+     * In dc.js 2.1 and forward, only
+     * {@link https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_all group.all()}
+     * and `baseMixin.ordering()` are used.
      * @method cap
      * @memberof dc.capMixin
      * @instance

diff --git a/style/dc.scss b/style/dc.scss
@@ -11,7 +11,7 @@ $color_boston_blue: #3182bd;
 $color_blue: #00f;
 
 //fonts
-$font_sans_serif: 'sans-serif';
+$font_sans_serif: sans-serif;
 
 @mixin no-select {
   -webkit-touch-callout: none;
@@ -271,4 +271,4 @@ div.dc-chart {
 
 .dc-hard .number-display {
     float: none;
-}
+}
diff --git a/web/css/dc.css b/web/css/dc.css
@@ -46,7 +46,7 @@ div.dc-chart {
   shape-rendering: crispEdges; }
 
 .dc-chart .axis text {
-  font: 10px "sans-serif"; }
+  font: 10px sans-serif; }
 
 .dc-chart .grid-line, .dc-chart .axis .grid-line, .dc-chart .grid-line line, .dc-chart .axis .grid-line line {
   fill: none;
@@ -143,7 +143,7 @@ div.dc-chart {
   stroke-opacity: 0.2; }
 
 .dc-chart .box text {
-  font: 10px "sans-serif";
+  font: 10px sans-serif;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -khtml-user-select: none;

diff --git a/web/docs/api-2.0.0.md b/web/docs/api-2.0.0.md
@@ -4464,6 +4464,20 @@ Get or set the count of elements to that will be included in the cap. If there i
 [othersGrouper](#dc.capMixin+othersGrouper), any further elements will be combined in an
 extra element with its name determined by [othersLabel](#dc.capMixin+othersLabel).
 
+Up through dc.js 2.0.*, capping uses
+[group.top(N)](https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_top),
+which selects the largest items according to
+[group.order()](https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_order).
+The chart then sorts the items according to [baseMixin.ordering()](#dc.baseMixin+ordering).
+So the two values essentially have to agree, but if the former is incorrect (it's easy to
+forget about `group.order()`), the latter will mask the problem. This also makes
+[fake groups](https://github.com/dc-js/dc.js/wiki/FAQ#fake-groups) difficult to
+implement.
+
+In dc.js 2.1 and forward, only
+[group.all()](https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_all)
+and `baseMixin.ordering()` are used.
+
 **Kind**: instance method of <code>[capMixin](#dc.capMixin)</code>  
 
 | Param | Type | Default |

diff --git a/web/docs/api-latest.md b/web/docs/api-latest.md
@@ -11,7 +11,7 @@ such as [.svg](#dc.baseMixin+svg) and [.xAxis](#dc.coordinateGridMixin+xAxis),
 return values that are themselves chainable d3 objects.
 
 **Kind**: global namespace  
-**Version**: 2.1.0  
+**Version**: 2.1.1  
 **Example**  
 ```js
 // Example chaining
@@ -4610,6 +4610,20 @@ Get or set the count of elements to that will be included in the cap. If there i
 [othersGrouper](#dc.capMixin+othersGrouper), any further elements will be combined in an
 extra element with its name determined by [othersLabel](#dc.capMixin+othersLabel).
 
+Up through dc.js 2.0.*, capping uses
+[group.top(N)](https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_top),
+which selects the largest items according to
+[group.order()](https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_order).
+The chart then sorts the items according to [baseMixin.ordering()](#dc.baseMixin+ordering).
+So the two values essentially have to agree, but if the former is incorrect (it's easy to
+forget about `group.order()`), the latter will mask the problem. This also makes
+[fake groups](https://github.com/dc-js/dc.js/wiki/FAQ#fake-groups) difficult to
+implement.
+
+In dc.js 2.1 and forward, only
+[group.all()](https://github.com/crossfilter/crossfilter/wiki/API-Reference#group_all)
+and `baseMixin.ordering()` are used.
+
 **Kind**: instance method of <code>[capMixin](#dc.capMixin)</code>  
 
 | Param | Type | Default |

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