Improve joshing reporting. Added a JSHint config file.

Fixed JSHint warnings.

diff --git a/config.jshintrc b/config.jshintrc
new file mode 100644 (file)
index 0000000..978cc98
--- /dev/null
+++ b/config.jshintrc
@@ -0,0 +1,4 @@
+{
+       "node": true,
+       "predef": [ "require", "module" ]
+}
\ No newline at end of file

diff --git a/dist/Chart.bundle.js b/dist/Chart.bundle.js
index 7e4449189584da580ad2d5ef5bb73002358b3c8a..2f87f71357b2dab608b0392a92cddf7abfb15eb3 100644 (file)
--- a/dist/Chart.bundle.js
+++ b/dist/Chart.bundle.js
@@ -4792,47 +4792,47 @@ window.Color = module.exports = Color
  */
 
 
-var Chart = require('./core/core.js')()
-
-require('./core/core.helpers')(Chart)
-require('./core/core.element')(Chart)
-require('./core/core.animation')(Chart)
-require('./core/core.controller')(Chart)
-require('./core/core.datasetController')(Chart)
-require('./core/core.layoutService')(Chart)
-require('./core/core.legend')(Chart)
-require('./core/core.scale')(Chart)
-require('./core/core.scaleService')(Chart)
-require('./core/core.title')(Chart)
-require('./core/core.tooltip')(Chart)
-
-require('./controllers/controller.bar')(Chart)
-require('./controllers/controller.bubble')(Chart)
-require('./controllers/controller.doughnut')(Chart)
-require('./controllers/controller.line')(Chart)
-require('./controllers/controller.polarArea')(Chart)
-require('./controllers/controller.radar')(Chart)
-
-require('./scales/scale.category')(Chart)
-require('./scales/scale.linear')(Chart)
-require('./scales/scale.logarithmic')(Chart)
-require('./scales/scale.radialLinear')(Chart)
-require('./scales/scale.time')(Chart)
-
-require('./elements/element.arc')(Chart)
-require('./elements/element.line')(Chart)
-require('./elements/element.point')(Chart)
-require('./elements/element.rectangle')(Chart)
-
-require('./charts/Chart.Bar')(Chart)
-require('./charts/Chart.Bubble')(Chart)
-require('./charts/Chart.Doughnut')(Chart)
-require('./charts/Chart.Line')(Chart)
-require('./charts/Chart.PolarArea')(Chart)
-require('./charts/Chart.Radar')(Chart)
-require('./charts/Chart.Scatter')(Chart)
-
-window.Chart = module.exports = Chart
+var Chart = require('./core/core.js')();
+
+require('./core/core.helpers')(Chart);
+require('./core/core.element')(Chart);
+require('./core/core.animation')(Chart);
+require('./core/core.controller')(Chart);
+require('./core/core.datasetController')(Chart);
+require('./core/core.layoutService')(Chart);
+require('./core/core.legend')(Chart);
+require('./core/core.scale')(Chart);
+require('./core/core.scaleService')(Chart);
+require('./core/core.title')(Chart);
+require('./core/core.tooltip')(Chart);
+
+require('./controllers/controller.bar')(Chart);
+require('./controllers/controller.bubble')(Chart);
+require('./controllers/controller.doughnut')(Chart);
+require('./controllers/controller.line')(Chart);
+require('./controllers/controller.polarArea')(Chart);
+require('./controllers/controller.radar')(Chart);
+
+require('./scales/scale.category')(Chart);
+require('./scales/scale.linear')(Chart);
+require('./scales/scale.logarithmic')(Chart);
+require('./scales/scale.radialLinear')(Chart);
+require('./scales/scale.time')(Chart);
+
+require('./elements/element.arc')(Chart);
+require('./elements/element.line')(Chart);
+require('./elements/element.point')(Chart);
+require('./elements/element.rectangle')(Chart);
+
+require('./charts/Chart.Bar')(Chart);
+require('./charts/Chart.Bubble')(Chart);
+require('./charts/Chart.Doughnut')(Chart);
+require('./charts/Chart.Line')(Chart);
+require('./charts/Chart.PolarArea')(Chart);
+require('./charts/Chart.Radar')(Chart);
+require('./charts/Chart.Scatter')(Chart);
+
+window.Chart = module.exports = Chart;
 
 },{"./charts/Chart.Bar":8,"./charts/Chart.Bubble":9,"./charts/Chart.Doughnut":10,"./charts/Chart.Line":11,"./charts/Chart.PolarArea":12,"./charts/Chart.Radar":13,"./charts/Chart.Scatter":14,"./controllers/controller.bar":15,"./controllers/controller.bubble":16,"./controllers/controller.doughnut":17,"./controllers/controller.line":18,"./controllers/controller.polarArea":19,"./controllers/controller.radar":20,"./core/core.animation":21,"./core/core.controller":22,"./core/core.datasetController":23,"./core/core.element":24,"./core/core.helpers":25,"./core/core.js":26,"./core/core.layoutService":27,"./core/core.legend":28,"./core/core.scale":29,"./core/core.scaleService":30,"./core/core.title":31,"./core/core.tooltip":32,"./elements/element.arc":33,"./elements/element.line":34,"./elements/element.point":35,"./elements/element.rectangle":36,"./scales/scale.category":37,"./scales/scale.linear":38,"./scales/scale.logarithmic":39,"./scales/scale.radialLinear":40,"./scales/scale.time":41}],8:[function(require,module,exports){
 "use strict";
@@ -4903,7 +4903,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     aspectRatio: 1,
@@ -4972,7 +4972,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.bar = {
     hover: {
@@ -5279,7 +5279,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.bubble = {
                hover: {
@@ -5449,7 +5449,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.doughnut = {
                animation: {
@@ -5701,7 +5701,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.line = {
     showLines: true,
@@ -5993,7 +5993,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.polarArea = {
 
@@ -6223,7 +6223,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
 
   Chart.defaults.radar = {
@@ -6431,7 +6431,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.animation = {
     duration: 1000,
@@ -6550,7 +6550,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
   //Create a dictionary of chart types, to allow for extension of existing types
   Chart.types = {};
 
@@ -7112,7 +7112,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   // Base class for all dataset controllers (line, bar, etc)
   Chart.DatasetController = function(chart, datasetIndex) {
@@ -7187,7 +7187,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.elements = {};
 
@@ -7282,7 +7282,7 @@ module.exports = function(Chart) {
 /*global document: false */
 "use strict";
 
-var color = require('chartjs-color')
+var color = require('chartjs-color');
 
 module.exports = function(Chart) {
 
@@ -8173,7 +8173,7 @@ module.exports = function(Chart) {
     }
   };
 
-}
+};
 
 },{"chartjs-color":5}],26:[function(require,module,exports){
 "use strict";
@@ -8275,9 +8275,9 @@ module.exports = function() {
         return text.join("");
       }
     },
-  }
+  };
 
-       return Chart
+       return Chart;
 
 };
 
@@ -8286,7 +8286,7 @@ module.exports = function() {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   // The layout service is very self explanatory.  It's responsible for the layout within a chart.
   // Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need
@@ -8611,7 +8611,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.legend = {
 
@@ -8937,7 +8937,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.scale = {
     display: true,
@@ -9612,7 +9612,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.scaleService = {
     // Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
@@ -9648,7 +9648,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.title = {
     display: false,
@@ -9843,7 +9843,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
        
   Chart.defaults.global.tooltips = {
     enabled: true,
@@ -10457,7 +10457,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart, moment) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.arc = {
     backgroundColor: Chart.defaults.global.defaultColor,
@@ -10540,7 +10540,7 @@ module.exports = function(Chart, moment) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.line = {
     tension: 0.4,
@@ -10703,7 +10703,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.point = {
     radius: 3,
@@ -10765,8 +10765,8 @@ module.exports = function(Chart) {
 
         var radius = vm.radius || Chart.defaults.global.elements.point.radius;
 
-        var xOffset
-        var yOffset
+        var xOffset;
+        var yOffset;
 
         switch (vm.pointStyle) {
           // Default includes circle
@@ -10854,7 +10854,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.rectangle = {
     backgroundColor: Chart.defaults.global.defaultColor,
@@ -10942,7 +10942,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
   // Default config for a category scale
   var defaultConfig = {
     position: "bottom",
@@ -10992,7 +10992,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     position: "left",
@@ -11076,7 +11076,7 @@ module.exports = function(Chart) {
         helpers.each(valuesPerType, function(valuesForType) {
           var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
           var minVal = helpers.min(values);
-          var maxVal = helpers.max(values)
+          var maxVal = helpers.max(values);
           this.min = this.min === null ? minVal : Math.min(this.min, minVal);
           this.max = this.max === null ? maxVal : Math.max(this.max, maxVal);
         }, this);
@@ -11250,7 +11250,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     position: "left",
@@ -11444,7 +11444,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     display: true,
@@ -11876,12 +11876,12 @@ module.exports = function(Chart) {
 /*global window: false */
 "use strict";
 
-var moment = require('moment')
-moment = typeof(moment) === 'function' ? moment : window.moment
+var moment = require('moment');
+moment = typeof(moment) === 'function' ? moment : window.moment;
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   if (!moment) {
     console.warn('Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at http://momentjs.com/');

diff --git a/dist/Chart.js b/dist/Chart.js
index ce0d4baf7998da53a7619b5722fbb8658853d4dd..dc5973720e2f8044c5d39a9ca383f213b1ef124b 100644 (file)
--- a/dist/Chart.js
+++ b/dist/Chart.js
@@ -1598,47 +1598,47 @@ window.Color = module.exports = Color
  */
 
 
-var Chart = require('./core/core.js')()
-
-require('./core/core.helpers')(Chart)
-require('./core/core.element')(Chart)
-require('./core/core.animation')(Chart)
-require('./core/core.controller')(Chart)
-require('./core/core.datasetController')(Chart)
-require('./core/core.layoutService')(Chart)
-require('./core/core.legend')(Chart)
-require('./core/core.scale')(Chart)
-require('./core/core.scaleService')(Chart)
-require('./core/core.title')(Chart)
-require('./core/core.tooltip')(Chart)
-
-require('./controllers/controller.bar')(Chart)
-require('./controllers/controller.bubble')(Chart)
-require('./controllers/controller.doughnut')(Chart)
-require('./controllers/controller.line')(Chart)
-require('./controllers/controller.polarArea')(Chart)
-require('./controllers/controller.radar')(Chart)
-
-require('./scales/scale.category')(Chart)
-require('./scales/scale.linear')(Chart)
-require('./scales/scale.logarithmic')(Chart)
-require('./scales/scale.radialLinear')(Chart)
-require('./scales/scale.time')(Chart)
-
-require('./elements/element.arc')(Chart)
-require('./elements/element.line')(Chart)
-require('./elements/element.point')(Chart)
-require('./elements/element.rectangle')(Chart)
-
-require('./charts/Chart.Bar')(Chart)
-require('./charts/Chart.Bubble')(Chart)
-require('./charts/Chart.Doughnut')(Chart)
-require('./charts/Chart.Line')(Chart)
-require('./charts/Chart.PolarArea')(Chart)
-require('./charts/Chart.Radar')(Chart)
-require('./charts/Chart.Scatter')(Chart)
-
-window.Chart = module.exports = Chart
+var Chart = require('./core/core.js')();
+
+require('./core/core.helpers')(Chart);
+require('./core/core.element')(Chart);
+require('./core/core.animation')(Chart);
+require('./core/core.controller')(Chart);
+require('./core/core.datasetController')(Chart);
+require('./core/core.layoutService')(Chart);
+require('./core/core.legend')(Chart);
+require('./core/core.scale')(Chart);
+require('./core/core.scaleService')(Chart);
+require('./core/core.title')(Chart);
+require('./core/core.tooltip')(Chart);
+
+require('./controllers/controller.bar')(Chart);
+require('./controllers/controller.bubble')(Chart);
+require('./controllers/controller.doughnut')(Chart);
+require('./controllers/controller.line')(Chart);
+require('./controllers/controller.polarArea')(Chart);
+require('./controllers/controller.radar')(Chart);
+
+require('./scales/scale.category')(Chart);
+require('./scales/scale.linear')(Chart);
+require('./scales/scale.logarithmic')(Chart);
+require('./scales/scale.radialLinear')(Chart);
+require('./scales/scale.time')(Chart);
+
+require('./elements/element.arc')(Chart);
+require('./elements/element.line')(Chart);
+require('./elements/element.point')(Chart);
+require('./elements/element.rectangle')(Chart);
+
+require('./charts/Chart.Bar')(Chart);
+require('./charts/Chart.Bubble')(Chart);
+require('./charts/Chart.Doughnut')(Chart);
+require('./charts/Chart.Line')(Chart);
+require('./charts/Chart.PolarArea')(Chart);
+require('./charts/Chart.Radar')(Chart);
+require('./charts/Chart.Scatter')(Chart);
+
+window.Chart = module.exports = Chart;
 
 },{"./charts/Chart.Bar":8,"./charts/Chart.Bubble":9,"./charts/Chart.Doughnut":10,"./charts/Chart.Line":11,"./charts/Chart.PolarArea":12,"./charts/Chart.Radar":13,"./charts/Chart.Scatter":14,"./controllers/controller.bar":15,"./controllers/controller.bubble":16,"./controllers/controller.doughnut":17,"./controllers/controller.line":18,"./controllers/controller.polarArea":19,"./controllers/controller.radar":20,"./core/core.animation":21,"./core/core.controller":22,"./core/core.datasetController":23,"./core/core.element":24,"./core/core.helpers":25,"./core/core.js":26,"./core/core.layoutService":27,"./core/core.legend":28,"./core/core.scale":29,"./core/core.scaleService":30,"./core/core.title":31,"./core/core.tooltip":32,"./elements/element.arc":33,"./elements/element.line":34,"./elements/element.point":35,"./elements/element.rectangle":36,"./scales/scale.category":37,"./scales/scale.linear":38,"./scales/scale.logarithmic":39,"./scales/scale.radialLinear":40,"./scales/scale.time":41}],8:[function(require,module,exports){
 "use strict";
@@ -1709,7 +1709,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     aspectRatio: 1,
@@ -1778,7 +1778,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.bar = {
     hover: {
@@ -2085,7 +2085,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.bubble = {
                hover: {
@@ -2255,7 +2255,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.doughnut = {
                animation: {
@@ -2507,7 +2507,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.line = {
     showLines: true,
@@ -2799,7 +2799,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.polarArea = {
 
@@ -3029,7 +3029,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
 
   Chart.defaults.radar = {
@@ -3237,7 +3237,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.animation = {
     duration: 1000,
@@ -3356,7 +3356,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
   //Create a dictionary of chart types, to allow for extension of existing types
   Chart.types = {};
 
@@ -3918,7 +3918,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   // Base class for all dataset controllers (line, bar, etc)
   Chart.DatasetController = function(chart, datasetIndex) {
@@ -3993,7 +3993,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.elements = {};
 
@@ -4088,7 +4088,7 @@ module.exports = function(Chart) {
 /*global document: false */
 "use strict";
 
-var color = require('chartjs-color')
+var color = require('chartjs-color');
 
 module.exports = function(Chart) {
 
@@ -4979,7 +4979,7 @@ module.exports = function(Chart) {
     }
   };
 
-}
+};
 
 },{"chartjs-color":6}],26:[function(require,module,exports){
 "use strict";
@@ -5081,9 +5081,9 @@ module.exports = function() {
         return text.join("");
       }
     },
-  }
+  };
 
-       return Chart
+       return Chart;
 
 };
 
@@ -5092,7 +5092,7 @@ module.exports = function() {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   // The layout service is very self explanatory.  It's responsible for the layout within a chart.
   // Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need
@@ -5417,7 +5417,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.legend = {
 
@@ -5743,7 +5743,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.scale = {
     display: true,
@@ -6418,7 +6418,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.scaleService = {
     // Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
@@ -6454,7 +6454,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.title = {
     display: false,
@@ -6649,7 +6649,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
        
   Chart.defaults.global.tooltips = {
     enabled: true,
@@ -7263,7 +7263,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart, moment) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.arc = {
     backgroundColor: Chart.defaults.global.defaultColor,
@@ -7346,7 +7346,7 @@ module.exports = function(Chart, moment) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.line = {
     tension: 0.4,
@@ -7509,7 +7509,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.point = {
     radius: 3,
@@ -7571,8 +7571,8 @@ module.exports = function(Chart) {
 
         var radius = vm.radius || Chart.defaults.global.elements.point.radius;
 
-        var xOffset
-        var yOffset
+        var xOffset;
+        var yOffset;
 
         switch (vm.pointStyle) {
           // Default includes circle
@@ -7660,7 +7660,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.rectangle = {
     backgroundColor: Chart.defaults.global.defaultColor,
@@ -7748,7 +7748,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
   // Default config for a category scale
   var defaultConfig = {
     position: "bottom",
@@ -7798,7 +7798,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     position: "left",
@@ -7882,7 +7882,7 @@ module.exports = function(Chart) {
         helpers.each(valuesPerType, function(valuesForType) {
           var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
           var minVal = helpers.min(values);
-          var maxVal = helpers.max(values)
+          var maxVal = helpers.max(values);
           this.min = this.min === null ? minVal : Math.min(this.min, minVal);
           this.max = this.max === null ? maxVal : Math.max(this.max, maxVal);
         }, this);
@@ -8056,7 +8056,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     position: "left",
@@ -8250,7 +8250,7 @@ module.exports = function(Chart) {
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     display: true,
@@ -8682,12 +8682,12 @@ module.exports = function(Chart) {
 /*global window: false */
 "use strict";
 
-var moment = require('moment')
-moment = typeof(moment) === 'function' ? moment : window.moment
+var moment = require('moment');
+moment = typeof(moment) === 'function' ? moment : window.moment;
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   if (!moment) {
     console.warn('Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at http://momentjs.com/');

diff --git a/gulpfile.js b/gulpfile.js
index a2568edd1b52db0a30203aaafbe86e517bd41fdc..7b2710983b7d44839a316ec19c345fa71e67ed4f 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -120,8 +120,9 @@ function releaseTask() {
 
 function jshintTask() {
   return gulp.src(srcDir + '**/*.js')
-    .pipe(jshint())
-    .pipe(jshint.reporter('default'));
+    .pipe(jshint('config.jshintrc'))
+    .pipe(jshint.reporter('jshint-stylish'))
+    .pipe(jshint.reporter('fail'));
 }
 
 

diff --git a/package.json b/package.json
index 6fcb71693f22cd26e6c9c94051618ddb2258bffc..3f3602dcfa532840cd73bf4a80b058874c0c3bb0 100644 (file)
--- a/package.json
+++ b/package.json
@@ -34,7 +34,8 @@
     "karma-jasmine-html-reporter": "^0.1.8",
     "merge-stream": "^1.0.0",
     "semver": "^3.0.1",
-    "vinyl-source-stream": "^1.1.0"
+    "vinyl-source-stream": "^1.1.0",
+    "jshint-stylish": "~2.1.0"
   },
   "spm": {
     "main": "Chart.js"

diff --git a/samples/timeScale/line-time-scale.html b/samples/timeScale/line-time-scale.html
index 0f6210388b14adf127e1abd9acd8d4372e79b770..8de242b61189aacb750469c506da3574e23f0536 100644 (file)
--- a/samples/timeScale/line-time-scale.html
+++ b/samples/timeScale/line-time-scale.html
@@ -3,7 +3,7 @@
 
 <head>
        <title>Line Chart</title>
-       <!-- <script src="../../node_modules/moment/min/moment.min.js"></script> -->
+       <script src="../../node_modules/moment/min/moment.min.js"></script>
        <script src="../../dist/Chart.bundle.js"></script>
        <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
        <style>

diff --git a/src/chart.js b/src/chart.js
index 7bff2575bd36f1a91a2da6fefe4b673f51ee5f71..d0c4fd067b29e9ebd3c29f5284528b1399bb2e52 100644 (file)
--- a/src/chart.js
+++ b/src/chart.js
@@ -9,44 +9,44 @@
  */
 
 
-var Chart = require('./core/core.js')()
-
-require('./core/core.helpers')(Chart)
-require('./core/core.element')(Chart)
-require('./core/core.animation')(Chart)
-require('./core/core.controller')(Chart)
-require('./core/core.datasetController')(Chart)
-require('./core/core.layoutService')(Chart)
-require('./core/core.legend')(Chart)
-require('./core/core.scale')(Chart)
-require('./core/core.scaleService')(Chart)
-require('./core/core.title')(Chart)
-require('./core/core.tooltip')(Chart)
-
-require('./controllers/controller.bar')(Chart)
-require('./controllers/controller.bubble')(Chart)
-require('./controllers/controller.doughnut')(Chart)
-require('./controllers/controller.line')(Chart)
-require('./controllers/controller.polarArea')(Chart)
-require('./controllers/controller.radar')(Chart)
-
-require('./scales/scale.category')(Chart)
-require('./scales/scale.linear')(Chart)
-require('./scales/scale.logarithmic')(Chart)
-require('./scales/scale.radialLinear')(Chart)
-require('./scales/scale.time')(Chart)
-
-require('./elements/element.arc')(Chart)
-require('./elements/element.line')(Chart)
-require('./elements/element.point')(Chart)
-require('./elements/element.rectangle')(Chart)
-
-require('./charts/Chart.Bar')(Chart)
-require('./charts/Chart.Bubble')(Chart)
-require('./charts/Chart.Doughnut')(Chart)
-require('./charts/Chart.Line')(Chart)
-require('./charts/Chart.PolarArea')(Chart)
-require('./charts/Chart.Radar')(Chart)
-require('./charts/Chart.Scatter')(Chart)
-
-window.Chart = module.exports = Chart
+var Chart = require('./core/core.js')();
+
+require('./core/core.helpers')(Chart);
+require('./core/core.element')(Chart);
+require('./core/core.animation')(Chart);
+require('./core/core.controller')(Chart);
+require('./core/core.datasetController')(Chart);
+require('./core/core.layoutService')(Chart);
+require('./core/core.legend')(Chart);
+require('./core/core.scale')(Chart);
+require('./core/core.scaleService')(Chart);
+require('./core/core.title')(Chart);
+require('./core/core.tooltip')(Chart);
+
+require('./controllers/controller.bar')(Chart);
+require('./controllers/controller.bubble')(Chart);
+require('./controllers/controller.doughnut')(Chart);
+require('./controllers/controller.line')(Chart);
+require('./controllers/controller.polarArea')(Chart);
+require('./controllers/controller.radar')(Chart);
+
+require('./scales/scale.category')(Chart);
+require('./scales/scale.linear')(Chart);
+require('./scales/scale.logarithmic')(Chart);
+require('./scales/scale.radialLinear')(Chart);
+require('./scales/scale.time')(Chart);
+
+require('./elements/element.arc')(Chart);
+require('./elements/element.line')(Chart);
+require('./elements/element.point')(Chart);
+require('./elements/element.rectangle')(Chart);
+
+require('./charts/Chart.Bar')(Chart);
+require('./charts/Chart.Bubble')(Chart);
+require('./charts/Chart.Doughnut')(Chart);
+require('./charts/Chart.Line')(Chart);
+require('./charts/Chart.PolarArea')(Chart);
+require('./charts/Chart.Radar')(Chart);
+require('./charts/Chart.Scatter')(Chart);
+
+window.Chart = module.exports = Chart;

diff --git a/src/charts/Chart.Radar.js b/src/charts/Chart.Radar.js
index e80b47caac51bf82b8f80417ed5e744742f5cd98..3194df85eefc5c9a3162bb85c9de46a782afde6f 100644 (file)
--- a/src/charts/Chart.Radar.js
+++ b/src/charts/Chart.Radar.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     aspectRatio: 1,

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 3cb20da1cdc09c39608c8f49e5da0ad6e3b09b50..aa312a6486f1a2c02f95d78806eaf2dfe23a4d5d 100644 (file)
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.bar = {
     hover: {

diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index da2180d32ca7fbfb6789f988ff05f53e0ef2a7e8..d6aace3d33d1f4d3afa917187e205571f10c5dfb 100644 (file)
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.bubble = {
                hover: {

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index e7c0e12d09a48400921fd99eb57f4ffd36d918d6..3cce2de20e09c639f535a11cfc8fe729e9c2b2e7 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.doughnut = {
                animation: {

diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 85678e67c0baba4865a0f504caa60186814cac97..b456535b5ca04da38ec0eaadabc0fbf301121741 100644 (file)
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.line = {
     showLines: true,

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 57c486086d6d6f9357f23d00722947234ea73471..9f3a7c15dea236ec530fc5cdb53c32275b23617c 100644 (file)
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-       var helpers = Chart.helpers
+       var helpers = Chart.helpers;
 
        Chart.defaults.polarArea = {
 

diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index c90882dbc004d9de4eaddd3f1c37d52869b441fc..a9f370434a771173f8451e9fbc45b7dcf36ec1da 100644 (file)
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
 
   Chart.defaults.radar = {

diff --git a/src/core/core.animation.js b/src/core/core.animation.js
index f4fa29bbfa308b0241ec7f92dd0a875023916d07..2f2393760cf48f3fa19cd74d09e3c2b4cb51327d 100644 (file)
--- a/src/core/core.animation.js
+++ b/src/core/core.animation.js
@@ -3,7 +3,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.animation = {
     duration: 1000,

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index bc248f3445af8569318d6cd4704afd4b89a3136e..ce8e9f5032b7fd2d8e16d8641e66ef70e0335f5a 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
   //Create a dictionary of chart types, to allow for extension of existing types
   Chart.types = {};
 

diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index 05ca4fb665812f8f90a3d4b3797096444f523757..08ac549a0c8da7903f966c4de61496c66207b9c2 100644 (file)
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   // Base class for all dataset controllers (line, bar, etc)
   Chart.DatasetController = function(chart, datasetIndex) {

diff --git a/src/core/core.element.js b/src/core/core.element.js
index 75e2620c05253238a895601a9f9c8535632e4972..e9e2a05ef0da0c3c407762ff0a322c26c2d7b378 100644 (file)
--- a/src/core/core.element.js
+++ b/src/core/core.element.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.elements = {};
 

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 9463b30a85c55ebb60e50d9558caab626e1f99d9..07216852f9fbfb3550c3b971738fd70f40613e9d 100644 (file)
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -2,7 +2,7 @@
 /*global document: false */
 "use strict";
 
-var color = require('chartjs-color')
+var color = require('chartjs-color');
 
 module.exports = function(Chart) {
 
@@ -893,4 +893,4 @@ module.exports = function(Chart) {
     }
   };
 
-}
+};

diff --git a/src/core/core.js b/src/core/core.js
index 80105af5514c9cc2e5d77fb6098d349cb5becfec..6806ac92b597ab98067104aa16284596c8b474ef 100755 (executable)
--- a/src/core/core.js
+++ b/src/core/core.js
@@ -97,8 +97,8 @@ module.exports = function() {
         return text.join("");
       }
     },
-  }
+  };
 
-       return Chart
+       return Chart;
 
 };

diff --git a/src/core/core.layoutService.js b/src/core/core.layoutService.js
index 9b71fd8caa65ce05c8267c4856e6e6934338f105..14b0cdb2134d1abc6ac61fad01674c60fd5f9062 100644 (file)
--- a/src/core/core.layoutService.js
+++ b/src/core/core.layoutService.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   // The layout service is very self explanatory.  It's responsible for the layout within a chart.
   // Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need

diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index 5369c490d77f68bb785610e72388a59de68b8357..337c73f49a65eec296e1efeebb6ba7d7d320712c 100644 (file)
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.legend = {
 

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 11f8b6225061486cbe9d81f9d4f3faaf0277cebd..0d73b5b9a678724f0910cce0fc3410cdd3f25c9f 100644 (file)
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.scale = {
     display: true,

diff --git a/src/core/core.scaleService.js b/src/core/core.scaleService.js
index a9954bb88b7c29ad7dfc2363d3efe084b4e5933e..eddf164581d5c1309b063f22ab3c106dad101cc9 100644 (file)
--- a/src/core/core.scaleService.js
+++ b/src/core/core.scaleService.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.scaleService = {
     // Scale registration object. Extensions can register new scale types (such as log or DB scales) and then

diff --git a/src/core/core.title.js b/src/core/core.title.js
index 6ebd88edcf04d76417ac767e73c468a091cf53c0..7caa93205c1f3826bbfe0d6759ce302cbbe50643 100644 (file)
--- a/src/core/core.title.js
+++ b/src/core/core.title.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.title = {
     display: false,

diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js
index 66874e139f0646cee9b6a97cb0adb186d69d08b6..e18c38596cfe9004e0a072cfab327ce2733e7bbe 100644 (file)
--- a/src/core/core.tooltip.js
+++ b/src/core/core.tooltip.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
        
   Chart.defaults.global.tooltips = {
     enabled: true,

diff --git a/src/elements/element.arc.js b/src/elements/element.arc.js
index b74396e876932562435f4d042a477a7f0cb16ae7..22db606710fffae9b06907693392d6e51867ca9e 100644 (file)
--- a/src/elements/element.arc.js
+++ b/src/elements/element.arc.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart, moment) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.arc = {
     backgroundColor: Chart.defaults.global.defaultColor,

diff --git a/src/elements/element.line.js b/src/elements/element.line.js
index f3ceaffe9b46984c37b6cccac0453550e10aac6d..a68dd6aa9814cf3c48ff15d20858438b38b2b635 100644 (file)
--- a/src/elements/element.line.js
+++ b/src/elements/element.line.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.line = {
     tension: 0.4,

diff --git a/src/elements/element.point.js b/src/elements/element.point.js
index 1c7338f3039eeac29c9b0b809d453783e202cdf2..15923d983589418959b0c0bf1b0f3dc4d1ba0f6a 100644 (file)
--- a/src/elements/element.point.js
+++ b/src/elements/element.point.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.point = {
     radius: 3,
@@ -64,8 +64,8 @@ module.exports = function(Chart) {
 
         var radius = vm.radius || Chart.defaults.global.elements.point.radius;
 
-        var xOffset
-        var yOffset
+        var xOffset;
+        var yOffset;
 
         switch (vm.pointStyle) {
           // Default includes circle

diff --git a/src/elements/element.rectangle.js b/src/elements/element.rectangle.js
index 5e848eb7783582eeb66f8a82e89c73e48341009a..4e8d0bc964680d6097ba206de8c8023254b76208 100644 (file)
--- a/src/elements/element.rectangle.js
+++ b/src/elements/element.rectangle.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   Chart.defaults.global.elements.rectangle = {
     backgroundColor: Chart.defaults.global.defaultColor,

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 102d67be836f32b4c095d8a624d53eba387f63f4..5b67c7ab15e350016428abebb7064eda0879369e 100644 (file)
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
   // Default config for a category scale
   var defaultConfig = {
     position: "bottom",

diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index bcf750007114297c97751b2626f9cc15175dee78..8f32637f4f8cbb74a24db16084cb2009e4f68a3d 100644 (file)
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     position: "left",
@@ -86,7 +86,7 @@ module.exports = function(Chart) {
         helpers.each(valuesPerType, function(valuesForType) {
           var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
           var minVal = helpers.min(values);
-          var maxVal = helpers.max(values)
+          var maxVal = helpers.max(values);
           this.min = this.min === null ? minVal : Math.min(this.min, minVal);
           this.max = this.max === null ? maxVal : Math.max(this.max, maxVal);
         }, this);

diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
index 9e99056f12c77d142d3f0344da214cc2621b2c43..dc7d60ead30cbd81e3a1dce73ce19fb6c5f34d09 100644 (file)
--- a/src/scales/scale.logarithmic.js
+++ b/src/scales/scale.logarithmic.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     position: "left",

diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
index baf6c42553301f73dc3484b45114dd230fe02fc8..cb04e15a7b4497be7f7f4caf56e2d981ad6e1c93 100644 (file)
--- a/src/scales/scale.radialLinear.js
+++ b/src/scales/scale.radialLinear.js
@@ -2,7 +2,7 @@
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   var defaultConfig = {
     display: true,

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 49c49a6f1426e51e0eaee17b17db38797060f374..61ab22094deacffafe93340570d335522b64f779 100644 (file)
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -1,12 +1,12 @@
 /*global window: false */
 "use strict";
 
-var moment = require('moment')
-moment = typeof(moment) === 'function' ? moment : window.moment
+var moment = require('moment');
+moment = typeof(moment) === 'function' ? moment : window.moment;
 
 module.exports = function(Chart) {
 
-  var helpers = Chart.helpers
+  var helpers = Chart.helpers;
 
   if (!moment) {
     console.warn('Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at http://momentjs.com/');