Merge branch 'master'

also, not sure how this errant parameter name got through our
very rigorous linter

Conflicts:
	dc.js
	dc.js.map
	dc.min.js
	dc.min.js.map
	src/core.js
	web/js/dc.js
	web/js/dc.js.map
	web/js/dc.min.js
	web/js/dc.min.js.map

.jscsrc

@@ -1,87 +1,31 @@
 {
-    "requireCurlyBraces": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "try",
-        "catch"
-    ],
-    "requireOperatorBeforeLineBreak": true,
+    "preset": "google",
     "maximumLineLength": {
-        "value": 120,
-        "allowComments": true,
-        "allowRegex": true
+        "value": 140
     },
     "validateIndentation": 4,
-    "validateQuoteMarks": "'",
-    "disallowMultipleLineStrings": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "disallowSpaceAfterPrefixUnaryOperators": true,
-    "requireSpaceAfterKeywords": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "switch",
-        "return",
-        "try",
-        "catch"
-    ],
-    "requireSpaceBeforeBinaryOperators": [
-        "=",
-        "+=",
-        "-=",
-        "*=",
-        "/=",
-        "%=",
-        "<<=",
-        ">>=",
-        ">>>=",
-        "&=",
-        "|=",
-        "^=",
-        "+=",
-        "+",
-        "-",
-        "*",
-        "/",
-        "%",
-        "<<",
-        ">>",
-        ">>>",
-        "&",
-        "|",
-        "^",
-        "&&",
-        "||",
-        "===",
-        "==",
-        ">=",
-        "<=",
-        "<",
-        ">",
-        "!=",
-        "!=="
-    ],
-    "requireSpaceAfterBinaryOperators": true,
-    "requireSpacesInConditionalExpression": true,
-    "requireSpaceBeforeBlockStatements": true,
-    "requireSpacesInForStatement": true,
-    "requireLineFeedAtFileEnd": true,
+    "disallowMultipleVarDecl": null,
     "requireSpacesInFunctionExpression": {
-       "beforeOpeningRoundBrace": true,
-       "beforeOpeningCurlyBrace": true
+        "beforeOpeningRoundBrace": true,
+        "beforeOpeningCurlyBrace": true
     },
-    "disallowSpacesInsideObjectBrackets": "all",
-    "disallowSpacesInsideArrayBrackets": "all",
-    "disallowSpacesInsideParentheses": true,
-    "validateJSDoc": {
+    "requireSpacesInFunctionDeclaration": {
+        "beforeOpeningRoundBrace": true,
+        "beforeOpeningCurlyBrace": true
+    },
+    "disallowSpacesInFunctionExpression": null,
+    "disallowSpacesInAnonymousFunctionExpression": null,
+    "disallowSpacesInFunctionDeclaration": null,
+    "jsDoc": {
+        "checkAnnotations": "jsdoc3",
         "checkParamNames": true,
-        "requireParamTypes": true
+        "requireParamTypes": true,
+        "checkRedundantParams": true,
+        "checkReturnTypes": true,
+        "checkRedundantReturns": true,
+        "requireReturnTypes": true,
+        "checkTypes": "capitalizedNativeCase",
+        "checkRedundantAccess": true
     },
-    "disallowMultipleLineBreaks": true
+    "esnext": true
 }

.jshintrc

@@ -1,31 +1,78 @@
 {
-    "browser": true,
+    "bitwise": false,
     "camelcase": true,
     "curly": true,
     "eqeqeq": true,
-    "evil": false,
+    "forin": false,
+    "freeze": true,
     "immed": true,
+    "indent": 4,
     "latedef": true,
-    "loopfunc": true,
-    "maxlen": 120,
-    "multistr": true,
     "newcap": true,
     "noarg": true,
-    "noempty": true,
     "nonbsp": true,
     "nonew": true,
-    "quotmark": "single",
-    "sub": true,
+    "noempty": true,
+    "plusplus": false,
     "undef": true,
     "unused": "vars",
-    "globals" : {
+    "strict": false,
+    "maxparams": 5,
+    "maxdepth": 4,
+    "maxstatements": false,
+    "maxcomplexity": 10,
+    "maxlen": 140,
+    "quotmark": "single",
+    "asi": false,
+    "boss": false,
+    "debug": false,
+    "eqnull": false,
+    "esnext": true,
+    "evil": false,
+    "expr": false,
+    "funcscope": false,
+    "globalstrict": false,
+    "iterator": false,
+    "lastsemic": false,
+    "loopfunc": false,
+    "maxerr": 50,
+    "multistr": false,
+    "notypeof": false,
+    "proto": false,
+    "scripturl": false,
+    "shadow": false,
+    "supernew": false,
+    "sub": true,
+    "validthis": false,
+    "noyield": false,
+    "browser": true,
+    "couch": false,
+    "devel": false,
+    "dojo": false,
+    "jquery": false,
+    "mootools": false,
+    "node": true,
+    "nonstandard": false,
+    "prototypejs": false,
+    "rhino": false,
+    "worker": false,
+    "wsh": false,
+    "yui": false,
+    "globals": {
         "console": false,
-        "crossfilter" : false,
-        "d3" : false,
-        "dc" : false,
+        "crossfilter": false,
+        "d3": false,
+        "dc": false,
         "global": false,
         "module": false,
         "process": false,
-        "require": false
+        "require": false,
+        "jasmine": false,
+        "expect": false,
+        "describe": false,
+        "it": false,
+        "beforeEach": false,
+        "afterEach": false,
+        "spyOn": false
     }
 }

AUTHORS

@@ -64,3 +64,4 @@ Rob Hardwick <rob.hardwick@atchai.com>
 Jonathan Munz <jonathan.munz@upsight.com>
 Chris Alvino <alvino.chris@gmail.com>
 Emiliano Guevara <emiliano@opoint.com>
+Wang Xuan <wangxuan927@gmail.com>

Changelog.md

@@ -1,4 +1,11 @@
 # 2.0 Series
+## 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))
+
 ## 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))