NPM Dependecy Upgrades

.jscsrc

@@ -20,6 +20,7 @@
     "disallowMultipleLineStrings": true,
     "disallowMixedSpacesAndTabs": true,
     "disallowTrailingWhitespace": true,
+    "disallowSpaceAfterPrefixUnaryOperators": true,
     "requireSpaceAfterKeywords": [
         "if",
         "else",
@@ -70,6 +71,8 @@
     "requireSpaceAfterBinaryOperators": true,
     "requireSpacesInConditionalExpression": true,
     "requireSpaceBeforeBlockStatements": true,
+    "requireSpacesInForStatement": true,
+    "requireLineFeedAtFileEnd": true,
     "requireSpacesInFunctionExpression": {
        "beforeOpeningRoundBrace": true,
        "beforeOpeningCurlyBrace": true
@@ -82,4 +85,4 @@
         "requireParamTypes": true
     },
     "disallowMultipleLineBreaks": true
-}
+}

README.md

@@ -1,3 +1,4 @@
+[![Dependency Status](https://gemnasium.com/dc-js/dc.js.svg)](https://gemnasium.com/dc-js/dc.js)
 [![Build Status](https://api.travis-ci.org/dc-js/dc.js.png?branch=master)](http://travis-ci.org/dc-js/dc.js)
 [![Sauce Status](https://saucelabs.com/buildstatus/sclevine)](https://saucelabs.com/u/sclevine)
 [![NPM Status](https://badge.fury.io/js/dc.png)](http://badge.fury.io/js/dc)

package.json

@@ -33,25 +33,25 @@
     "grunt": "~0.4.1",
     "grunt-browserify": "^3.2.1",
     "grunt-cli": "~0.1.9",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-connect": "~0.7.1",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-jasmine": "~0.7.0",
+    "grunt-contrib-concat": "~0.5.0",
+    "grunt-contrib-connect": "~0.9.0",
+    "grunt-contrib-copy": "~0.7.0",
+    "grunt-contrib-jasmine": "~0.8.1",
     "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.2.4",
-    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-uglify": "~0.7.0",
+    "grunt-contrib-watch": "~0.6.1",
     "grunt-debug-task": "~0.1.4",
     "grunt-docco2": "~0.2.0",
     "grunt-fileindex": "^0.1.0",
-    "grunt-gh-pages": "~0.8.0",
-    "grunt-jscs": "~0.6.2",
-    "grunt-lib-phantomjs": "~0.5.0",
-    "grunt-markdown": "~0.5.0",
-    "grunt-saucelabs": "~8.1.1",
+    "grunt-gh-pages": "~0.9.1",
+    "grunt-jscs": "~1.2.0",
+    "grunt-lib-phantomjs": "~0.6.0",
+    "grunt-markdown": "~0.6.1",
+    "grunt-saucelabs": "~8.4.1",
     "grunt-sed": "~0.1.1",
-    "grunt-shell": "~0.5.0",
-    "grunt-template-jasmine-istanbul": "~0.3.0",
-    "marked": "~0.2.10",
+    "grunt-shell": "~1.1.1",
+    "grunt-template-jasmine-istanbul": "~0.3.1",
+    "marked": "~0.3.2",
     "uglify-js": "2.4.x"
   },
   "scripts": {

spec/event-spec.js

@@ -22,18 +22,16 @@ describe('dc event engine', function() {
             var times = 0;
             var i = 0;
 
-            /* jshint -W083 */
             while (i < 10) {
                 engine.trigger(function() {
                     times++;
                 }, 10);
                 i++;
             }
-            /* jshint +W083 */
-
-            setTimeout(function() {
-                expect(times).toEqual(1);
-            }, 10);
+            jasmine.clock().tick(5);
+            expect(times).toEqual(0);
+            jasmine.clock().tick(5);
+            expect(times).toEqual(1);
         });
         afterEach(function() {
         });

spec/line-chart-spec.js

@@ -35,6 +35,7 @@ describe('dc.lineChart', function() {
         describe('render data markers', function () {
             beforeEach(function () {
                 chart.dotRadius(5)
+                    .brushOn(false)
                     .renderDataPoints({}).render();
 
             });
@@ -44,7 +45,7 @@ describe('dc.lineChart', function() {
                     var dot = d3.select(this);
                     expect(dot.style("fill-opacity")).toBeWithinDelta(0.8);
                     expect(dot.style("stroke-opacity")).toBeWithinDelta(0.8);
-                    expect(dot.attr("r")).toBe(2);
+                    expect(dot.attr("r")).toBe('2');
                 });
             });
 
@@ -54,17 +55,17 @@ describe('dc.lineChart', function() {
                     .render();
                 chart.selectAll("circle.dot").each(function () {
                     var dot = d3.select(this);
-                    expect(dot.attr("fill-opacity")).toBe(1);
-                    expect(dot.attr("stroke-opacity")).toBe(1);
-                    expect(dot.attr("r")).toBe(3);
+                    expect(dot.style("fill-opacity")).toBe('1');
+                    expect(dot.style("stroke-opacity")).toBe('1');
+                    expect(dot.attr("r")).toBe('3');
                 });
             });
 
             it('should change the radius on mousemove', function () {
                 chart.selectAll("circle.dot").each(function () {
                     var dot = d3.select(this);
                     dot.on("mousemove").call(this);
-                    expect(dot.attr("r")).toBe(5);
+                    expect(dot.attr("r")).toBe('5');
                 });
             });
 
@@ -73,7 +74,7 @@ describe('dc.lineChart', function() {
                     var dot = d3.select(this);
                     dot.on("mousemove").call(this);
                     dot.on("mouseout").call(this);
-                    expect(dot.attr("r")).toBe(3);
+                    expect(dot.attr("r")).toBe('2');
                 });
             });
 

spec/utils-spec.js

@@ -11,7 +11,7 @@ describe('dc utils', function() {
             expect(printer([[10, 30]])).toEqual("[10 -> 30]");
         });
         it('print simple string and a range', function() {
-            expect(printer(["a", [10, 30]]), "a).toEqual([10 -> 30]");
+            expect(printer(["a", [10, 30]])).toEqual("a, [10 -> 30]");
         });
     });
 

src/coordinate-grid-mixin.js

@@ -924,17 +924,15 @@ dc.coordinateGridMixin = function (_chart) {
     // borrowed from Crossfilter example
     _chart.resizeHandlePath = function (d) {
         var e = +(d === 'e'), x = e ? 1 : -1, y = brushHeight() / 3;
-        /*jshint -W014 */
-        return 'M' + (0.5 * x) + ',' + y
-            + 'A6,6 0 0 ' + e + ' ' + (6.5 * x) + ',' + (y + 6)
-            + 'V' + (2 * y - 6)
-            + 'A6,6 0 0 ' + e + ' ' + (0.5 * x) + ',' + (2 * y)
-            + 'Z'
-            + 'M' + (2.5 * x) + ',' + (y + 8)
-            + 'V' + (2 * y - 8)
-            + 'M' + (4.5 * x) + ',' + (y + 8)
-            + 'V' + (2 * y - 8);
-        /*jshint +W014 */
+        return 'M' + (0.5 * x) + ',' + y +
+            'A6,6 0 0 ' + e + ' ' + (6.5 * x) + ',' + (y + 6) +
+            'V' + (2 * y - 6) +
+            'A6,6 0 0 ' + e + ' ' + (0.5 * x) + ',' + (2 * y) +
+            'Z' +
+            'M' + (2.5 * x) + ',' + (y + 8) +
+            'V' + (2 * y - 8) +
+            'M' + (4.5 * x) + ',' + (y + 8) +
+            'V' + (2 * y - 8);
     };
 
     function getClipPathId() {

src/logger.js

@@ -37,4 +37,4 @@ dc.logger.deprecate = function (fn, msg) {
         return fn.apply(this, arguments);
     }
     return deprecated;
-};
+};