Update built files

Allow the user to change the time label display formats

.travis.yml

@@ -3,6 +3,11 @@ node_js:
   - "0.11"
   - "0.10"
 
+before_install:
+  - "export CHROME_BIN=chromium-browser"
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 before_script:
   - npm install
 
@@ -11,3 +16,5 @@ script:
 
 notifications:
   slack: chartjs:pcfCZR6ugg5TEcaLtmIfQYuA
+
+sudo: false

README.md

@@ -2,10 +2,33 @@
 
 [![Build Status](https://travis-ci.org/nnnick/Chart.js.svg?branch=v2.0-dev)](https://travis-ci.org/nnnick/Chart.js) [![Code Climate](https://codeclimate.com/github/nnnick/Chart.js/badges/gpa.svg)](https://codeclimate.com/github/nnnick/Chart.js)
 
-# Version 2.0 is in early alpha. We are changing the internal data model to reduce copying, increase performance and expose a more flexible API.
 
 *Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)
 
+## v2.0 Beta
+
+Current Release: [2.0.0-beta](https://github.com/nnnick/Chart.js/releases/tag/2.0.0-beta)
+
+The next generation and release of Chart.js has been well under way this year and we are very close to releasing some amazing new features including, but not limited to:
+- Rewritten, optimized, and unit-tested
+- New and improved scales (log, time, linear, category, multiple scales)
+- Improved responsiveness and resizing
+- Powerful support for adding, removing, changing, and updating data on the fly
+- Animations on all elements, colors and tooltips
+- Powerful customization when you need it. Automatic and dynamic when you don't.
+- Excellent support for modern frameworks and modular build systems.
+- Even more extensible via new element controllers, combo chart support, and hook system
+- Bug fixes not addressed in 1.x, and much, much more...
+
+#####Contributing to 2.0
+Submit PR's to the v2.0-dev branch.
+
+#####Building and Testing
+`gulp build`, `gulp test`
+
+## v1.x Status: Feature Complete
+We are now treating v1.x as feature complete.  PR's for bug fixes are welcome, but we urge any open PR's for v1.x features to be refactored and resubmitted for v2.x (if the feature has not already been implemented).
+
 ## Documentation
 
 You can find documentation at [chartjs.org/docs](http://www.chartjs.org/docs/). The markdown files that build the site are available under `/docs`. Please note - in some of the json examples of configuration you might notice some liquid tags - this is just for the generating the site html, please disregard.

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "Chart.js",
-    "version": "2.0.0-alpha",
+    "version": "2.0.0-beta",
     "description": "Simple HTML5 Charts using the canvas element",
     "homepage": "https://github.com/nnnick/Chart.js",
     "author": "nnnick",

docs/00-Getting-Started.md

@@ -34,9 +34,9 @@ bower install Chart.js --save
 npm install Chart.js --save
 ```
 
-https://cdnjs.com/libraries/chart.js
+https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.0.0-beta/Chart.js
 
-###Creating a chart
+###Creating a Chart
 
 To create a chart, we need to instantiate the `Chart` class. To do this, we need to pass in the node, jQuery instance, or 2d context of the canvas of where we want to draw the chart. Here's an example.
 
@@ -48,139 +48,147 @@ To create a chart, we need to instantiate the `Chart` class. To do this, we need
 // Any of the following formats may be used
 var ctx = document.getElementById("myChart");
 var ctx = document.getElementById("myChart").getContext("2d");
-var ctx = $("myChart");
+var ctx = $("#myChart");
 ```
 
 Once you have the element or context, you're ready to instantiate a pre-defined chart-type or create your own!
 
-The following example instantiates a the pre-defined Polar Area chart type with a config object of data and options.
-```javascript
-var myNewChart = Chart.PolarArea(ctx, {
-    data: data,
-    options: options
-});
-```
+The following example instantiates a bar chart showing the number of votes for different colors and the y-axis starting at 0.
 
-To create a scatter chart, which is a special configuration of a line chart, we use the following.
-```javascript
-var myScatterChart = Chart.Scatter(ctx, {
-    data: data,
-    options: options
-});
-```
-
-Alternatively, we can use the more advanced API to create simple or advanced chart types. In the example below, we are creating a line chart.
-```javascript
+```html
+<canvas id="myChart" width="400" height="400"></canvas>
+<script>
+var ctx = document.getElementById("myChart");
 var myChart = new Chart(ctx, {
-    type: 'line', // built in types are 'line', 'bar', 'radar', 'polarArea', 'doughnut', 'scatter'
-    data: data,
-    options: options
+		type: 'bar',
+		data: {
+			labels: ["Red", "Blue", "Yellow", "Green", "Purple", "Orange"],
+			datasets: [{
+					label: '# of Votes',
+					data: [12, 19, 3, 5, 2, 3]
+			}]
+		},
+		options:{
+			scales:{
+				yAxes:[{
+						ticks:{
+							beginAtZero:true
+						}
+					}]
+			}
+		}
 });
+</script>
 ```
 
+It's that easy to get started using Chart.js! From here you can explore the many options that can help you customise your charts with scales, tooltips, labels, colors, custom actions, and much more.
+
 ###Global chart configuration
 
 This concept was introduced in Chart.js 1.0 to keep configuration DRY, and allow for changing options globally across chart types, avoiding the need to specify options for each instance, or the default for a particular chart type.
 
 Chart.js merges configurations and options in a few places with the global defaults using chart type defaults and scales defaults. This way you can be as specific as you want in your individual chart configs, or change the defaults for Chart.js as a whole.
 
-```javascript
-Chart.defaults.global = {
-    responsive: true,
-    responsiveAnimationDuration: 0,
-    maintainAspectRatio: true,
-    events: ["mousemove", "mouseout", "click", "touchstart", "touchmove", "touchend"],
-    hover: {
-        onHover: null,
-        mode: 'single',
-        animationDuration: 400,
-    },
-    onClick: null,
-    defaultColor: 'rgba(0,0,0,0.1)',
+The global options are defined in `Chart.defaults.global`.
 
-    // Element defaults defined in element extensions
-    elements: {},
+Name | Type | Default | Description
+--- | --- | --- | ---
+responsive | Boolean | true | Resizes when the canvas container does.
+responsiveAnimationDuration | Number | 0 | Duration in milliseconds it takes to animate to new size after a resize event.
+maintainAspectRatio | Boolean | true | Maintain the original canvas aspect ratio `(width / height)` when resizing
+events | Array[String] | `["mousemove", "mouseout", "click", "touchstart", "touchmove", "touchend"]` | Events that the chart should listen to for tooltips and hovering
+hover |-|-|-
+*hover*.onHover | Function | null | Called when any of the events fire. Called in the context of the chart and passed an array of active elements (bars, points, etc)
+*hover*.mode | String | 'single' | Sets which elements hover. Acceptable options are `'single'`, `'label'`, or `'dataset'`. `single` highlights the closest element. `label` highlights elements in all datasets at the same `X` value. `dataset` highlights the closest dataset.
+*hover*.animationDuration | Number | 400 | Duration in milliseconds it takes to animate hover style changes
+onClick | Function | null | Called if the event is of type 'mouseup' or 'click'. Called in the context of the chart and passed an array of active elements
+defaultColor | Color | 'rgba(0,0,0,0.1)' |
+legendCallback | Function | ` function (chart) { // the chart object to generate a legend from.  }` | Function to generate a legend. Default implementation returns an HTML string.
 
-    // Legend template string
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets.length; i++){%><li><span style=\"background-color:<%=data.datasets[i].backgroundColor%>\"><%if(data.datasets[i].label){%><%=data.datasets[i].label%><%}%></span></li><%}%></ul>",
+The global options for tooltips are defined in `Chart.defaults.global.tooltips`.
 
-    animation: {
-        duration: 1000,
-        easing: "easeOutQuart",
-        onProgress: function() {},
-        onComplete: function() {},
-    },
+Name | Type | Default | Description
+--- |:---:| --- | ---
+enabled | Boolean | true |
+custom | | null |
+mode | String | 'single' | Sets which elements appear in the tooltip. Acceptable options are `'single'` or `'label'`. `single` highlights the closest element. `label` highlights elements in all datasets at the same `X` value. 
+backgroundColor | Color | 'rgba(0,0,0,0.8)' | Background color of the tooltip
+ | | |
+Label | | | There are three labels you can control. `title`, `body`, `footer` the star (\*) represents one of these three. *(i.e. titleFontFamily, footerSpacing)*
+\*FontFamily | String | "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif" |
+\*FontSize | Number | 12 |
+\*FontStyle | String | title - "bold", body - "normal", footer - "bold" |
+\*Spacing | Number | 2 |
+\*Color | Color | "#fff" |
+\*Align | String | "left" | text alignment. See [MDN Canvas Documentation](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/textAlign)
+titleMarginBottom | Number | 6 | Margin to add on bottom of title section
+footerMarginTop | Number | 6 | Margin to add before drawing the footer
+xPadding | Number | 6 | Padding to add on top and bottom of tooltip
+yPadding | Number | 6 | Padding to add on left and right of tooltip
+caretSize | Number | 5 | Size, in px, of the tooltip arrow
+cornerRadius | Number | 6 | Radius of tooltip corner curves
+xOffset | Number | 10 |
+multiKeyBackground | Color | "#fff" |
+ | | |
+callbacks | - | - |  V2.0 introduces callback functions as a replacement for the template engine in v1. The tooltip has the following callbacks for providing text. For all functions, 'this' will be the tooltip object create from the Chart.Tooltip constructor
+**Callback Functions** | | | All functions are called with the same arguments
+xLabel | String or Array[Strings] | | This is the xDataValue for each item to be displayed in the tooltip
+yLabel | String or Array[Strings] | | This is the yDataValue for each item to be displayed in the tooltip
+index | Number | | Data index.
+data | Object | | Data object passed to chart.
+`return`| String or Array[Strings] | | All functions must return either a string or an array of strings. Arrays of strings are treated as multiple lines of text.
+ | | |
+*callbacks*.beforeTitle | Function | none | Text to render before the title
+*callbacks*.title | Function | `function(tooltipItems, data) { //Pick first xLabel }` | Text to render as the title
+*callbacks*.afterTitle | Function | none | Text to render after the ttiel
+*callbacks*.beforeBody | Function | none | Text to render before the body section
+*callbacks*.beforeLabel | Function | none | Text to render before an individual label
+*callbacks*.label | Function | `function(tooltipItem, data) { // Returns "datasetLabel: tooltipItem.yLabel" }` | Text to render as label
+*callbacks*.afterLabel | Function | none | Text to render after an individual label
+*callbacks*.afterBody | Function | none | Text to render after the body section
+*callbacks*.beforeFooter | Function | none | Text to render before the footer section
+*callbacks*.footer | Function | none | Text to render as the footer
+*callbacks*.afterFooter | Function | none | Text to render after the footer section
 
-    tooltips:{
-        enabled: true,
-        custom: null,
-        backgroundColor: "rgba(0,0,0,0.8)",
-        fontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-        fontSize: 10,
-        fontStyle: "normal",
-        fontColor: "#fff",
-        titleFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-        titleFontSize: 12,
-        titleFontStyle: "bold",
-        titleFontColor: "#fff",
-        yPadding: 6,
-        xPadding: 6,
-        caretSize: 8,
-        cornerRadius: 6,
-        xOffset: 10,
-        template: [
-            '<% if(label){ %>',
-            '<%=label %>: ',
-            '<% } %>',
-            '<%=value %>',
-        ].join(''),
-        multiTemplate: [
-            '<%if (datasetLabel){ %>',
-            '<%=datasetLabel %>: ',
-            '<% } %>',
-            '<%=value %>'
-        ].join(''),
-        multiKeyBackground: '#fff',
-    },
+The global options for animations are defined in `Chart.defaults.global.animation`.
 
-    elements: {
-        arc: {   
-            backgroundColor: Chart.defaults.global.defaultColor,
-            borderColor: "#fff",
-            borderWidth: 2
-        },
-        line: {
-            tension: 0.4,
-            backgroundColor: Chart.defaults.global.defaultColor,
-            borderWidth: 3,
-            borderColor: Chart.defaults.global.defaultColor,
-            borderCapStyle: 'butt',
-            borderDash: [],
-            borderDashOffset: 0.0,
-            borderJoinStyle: 'miter',
-            fill: true, // do we fill in the area between the line and its base axis
-            skipNull: true,
-            drawNull: false,
-        },
-        point: {
-            radius: 3,
-            backgroundColor: Chart.defaults.global.defaultColor,
-            borderWidth: 1,
-            borderColor: Chart.defaults.global.defaultColor,
-            // Hover
-            hitRadius: 1,
-            hoverRadius: 4,
-            hoverBorderWidth: 1,
-        },
-        rectangle: {
-            backgroundColor: Chart.defaults.global.defaultColor,
-            borderWidth: 0,
-            borderColor: Chart.defaults.global.defaultColor,
-        }
+Name | Type | Default | Description
+--- |:---:| --- | ---
+duration | Number | 1000 | The number of milliseconds an animation takes.
+easing | String | "easeOutQuart" | Easing function to use. 
+onProgress | Function | none |
+onComplete | Function |none |
 
-    }
-}
-```
+The global options for elements are defined in `Chart.defaults.global.elements`.
+
+Name | Type | Default | Description
+--- |:---:| --- | ---
+arc | - | - | -
+*arc*.backgroundColor | Color | `Chart.defaults.global.defaultColor` | Default fill color for arcs
+*arc*.borderColor | Color | "#fff" | Default stroke color for arcs
+*arc*.borderWidth | Number | 2 | Default stroke width for arcs
+line | - | - | -
+*line*.tension | Number | 0.4 | Default bezier curve tension. Set to `0` for no bezier curves.
+*line*.backgroundColor | Color | `Chart.defaults.global.defaultColor` | Default line fill color
+*line*.borderWidth | Number | 3 | Default line stroke width
+*line*.borderColor | Color | `Chart.defaults.global.defaultColor` | Default line stroke color
+*line*.borderCapStyle | String | 'butt' | Default line cap style. See [MDN](https://developer.mozilla.org/en/docs/Web/API/CanvasRenderingContext2D/lineCap)
+*line*.borderDash | Array | `[]` | Default line dash. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash)
+*line*.borderDashOffset | Number | 0.0 | Default line dash offset. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineDashOffset)
+*line*.borderJoinStyle | String | 'miter' | Default line join style. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin)
+*line*.fill | Boolean | true | 
+point | - | - | -
+*point*.radius | Number | 3 | Default point radius
+*point*.backgroundColor | Color | `Chart.defaults.global.defaultColor` | Default point fill color
+*point*.borderWidth | Number | 1 | Default point stroke width
+*point*.borderColor | Color | `Chart.defaults.global.defaultColor` | Default point stroke color
+*point*.hitRadius | Number | 1 | Extra radius added to point radius for hit detection
+*point*.hoverRadius | Number | 4 | Default point radius when hovered
+*point*.hoverBorderWidth | Number | 1 | Default stroke width when hovered
+rectangle | - | - | -
+*rectangle*.backgroundColor | Color | `Chart.defaults.global.defaultColor` | Default bar fill color
+*rectangle*.borderWidth | Number | 0 | Default bar stroke width
+*rectangle*.borderColor | Color | `Chart.defaults.global.defaultColor` | Default bar stroke color
 
 If for example, you wanted all charts created to be responsive, and resize when the browser window does, the following setting can be changed:
 
@@ -188,4 +196,4 @@ If for example, you wanted all charts created to be responsive, and resize when
 Chart.defaults.global.responsive = true;
 ```
 
-Now, every time we create a chart, `options.responsive` will be `true`.
+Now, every time we create a chart, `options.responsive` will be `true`.

docs/01-Scales

@@ -1,227 +0,0 @@
----
-title: Getting started
-anchor: getting-started
----
-
-###Scales
-
-Scales in v2.0 of Chart.js are significantly more powerful, but also different than those of v1.0.
-- Multiple x & y axes are now supported.
-- A built-in label auto-skip feature now detects would-be overlapping ticks and labels and removes every nth label to keep things displaying normally. 
-- Scale labels
-
-Every scale extends a core scale class with the following options:
-
-```javascript
-Chart.defaults.scale = {
-	display: true,
-
-	// grid line settings
-	gridLines: {
-		show: true,
-		color: "rgba(0, 0, 0, 0.1)",
-		lineWidth: 1,
-		drawOnChartArea: true,
-		drawTicks: true,
-		zeroLineWidth: 1,
-		zeroLineColor: "rgba(0,0,0,0.25)",
-		offsetGridLines: false,
-	},
-
-	// scale label
-	scaleLabel: {
-		fontColor: '#666',
-		fontFamily: 'Helvetica Neue',
-		fontSize: 12,
-		fontStyle: 'normal',
-
-		// actual label
-		labelString: '',
-
-		// display property
-		show: false,
-	},
-
-	// label settings
-	ticks: {
-		beginAtZero: false,
-		fontSize: 12,
-		fontStyle: "normal",
-		fontColor: "#666",
-		fontFamily: "Helvetica Neue",
-		maxRotation: 90,
-		minRotation: 20,
-		mirror: false,
-		padding: 10,
-		reverse: false,
-		show: true,
-		template: "<%=value%>",
-		userCallback: false,
-	},
-};
-```
-
-The `userCallback` method may be used for advanced tick customization. The following callback would display every label in scientific notation
-```javascript
-{
-    scales: {
-        xAxes: [{
-            ticks: {
-                // Return an empty string to draw the tick line but hide the tick label
-                // Return `null` or `undefined` to hide the tick line entirely
-               	userCallback: function(value, index, values) {
-    				return value.toExponential();
-    			}
-            }
-        }]
-    }
-}
-```
-
-#### Category Scale
-The category scale will be familiar to those who have used v1.0. Labels are drawn in from the labels array included in the chart data.
-
-The category scale extends the core scale class with the following tick template:
-
-```javascript
-{
-	position: "bottom",
-}
-```
-
-#### Linear Scale
-The linear scale can be used to display numerical data. It can be placed on either the x or y axis. The scatter chart type automatically configures a line chart to use one of these scales for the x axis.
-
-The linear scale extends the core scale class with the following tick template:
-
-```javascript
-{
-	position: "left",
-}
-```
-
-#### Logarithmic Scale
-The logarithmic scale is used to display logarithmic data of course. It can be placed on either the x or y axis.
-
-The log scale extends the core scale class with the following tick template:
-
-```javascript
-{
-	position: "left",
-	ticks: {
-		template: "<%var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));if (remain === 1 || remain === 2 || remain === 5) {%><%=value.toExponential()%><%} else {%><%= null %><%}%>",
-	}
-}
-```
-
-#### Time Scale
-The time scale is used to display times and dates. It can be placed on the x axis. When building its ticks, it will automatically calculate the most comfortable unit base on the size of the scale.
-
-The time scale extends the core scale class with the following tick template:
-
-```javascript
-{
-	position: "bottom",
-	time: {
-		// string/callback - By default, date objects are expected. You may use a pattern string from http://momentjs.com/docs/#/parsing/string-format/ to parse a time string format, or use a callback function that is passed the label, and must return a moment() instance.
-		format: false,
-		// string - By default, unit will automatically be detected.  Override with 'week', 'month', 'year', etc. (see supported time measurements)
-		unit: false, 
-		// string - By default, no rounding is applied.  To round, set to a supported time unit eg. 'week', 'month', 'year', etc.
-		round: false, 
-		// string - By default, is set to the detected (or manually overridden) time unit's `display` property (see supported time measurements).  To override, use a pattern string from http://momentjs.com/docs/#/displaying/format/
-		displayFormat: false
-	},
-}
-```
-
-The following time measurements are supported:
-
-```javascript
-{
-	'millisecond': {
-		display: 'SSS [ms]', // 002 ms
-		maxStep: 1000,
-	},
-	'second': {
-		display: 'h:mm:ss a', // 11:20:01 AM
-		maxStep: 60,
-	},
-	'minute': {
-		display: 'h:mm:ss a', // 11:20:01 AM
-		maxStep: 60,
-	},
-	'hour': {
-		display: 'MMM D, hA', // Sept 4, 5PM
-		maxStep: 24,
-	},
-	'day': {
-		display: 'll', // Sep 4 2015
-		maxStep: 7,
-	},
-	'week': {
-		display: 'll', // Week 46, or maybe "[W]WW - YYYY" ?
-		maxStep: 4.3333,
-	},
-	'month': {
-		display: 'MMM YYYY', // Sept 2015
-		maxStep: 12,
-	},
-	'quarter': {
-		display: '[Q]Q - YYYY', // Q3
-		maxStep: 4,
-	},
-	'year': {
-		display: 'YYYY', // 2015
-		maxStep: false,
-	},
-}
-```
-
-#### Radial Linear Scale
-The radial linear scale is used specifically for the radar chart type.
-
-The radial linear scale extends the core scale class with the following tick template:
-
-```javascript
-{
-	animate: true,
-	lineArc: false,
-	position: "chartArea",
-
-	angleLines: {
-		show: true,
-		color: "rgba(0, 0, 0, 0.1)",
-		lineWidth: 1
-	},
-
-	// label settings
-	ticks: {
-		//Boolean - Show a backdrop to the scale label
-		showLabelBackdrop: true,
-
-		//String - The colour of the label backdrop
-		backdropColor: "rgba(255,255,255,0.75)",
-
-		//Number - The backdrop padding above & below the label in pixels
-		backdropPaddingY: 2,
-
-		//Number - The backdrop padding to the side of the label in pixels
-		backdropPaddingX: 2,
-	},
-
-	pointLabels: {
-		//String - Point label font declaration
-		fontFamily: "'Arial'",
-
-		//String - Point label font weight
-		fontStyle: "normal",
-
-		//Number - Point label font size in pixels
-		fontSize: 10,
-
-		//String - Point label font colour
-		fontColor: "#666",
-	},
-}
-```

docs/01-Scales.md

@@ -0,0 +1,262 @@
+---
+title: Getting started
+anchor: scales
+---
+
+###Scales
+
+Scales in v2.0 of Chart.js are significantly more powerful, but also different than those of v1.0.
+- Multiple x & y axes are now supported.
+- A built-in label auto-skip feature now detects would-be overlapping ticks and labels and removes every nth label to keep things displaying normally.
+- Scale titles are now supported
+
+Every scale extends a core scale class with the following options:
+
+Name | Type | Default | Description
+--- |:---:| --- | ---
+type | String | Chart specific. | Type of scale being employed. Custom scales can be created and registered with a string key. Options: ["category"](#scales-category-scale), ["linear"](#scales-linear-scale), ["logarithmic"](#scales-logarithmic-scale), ["time"](#scales-time-scale), ["radialLinear"](#scales-radial-linear-scale)
+display | Boolean | true | If true, show the scale including gridlines, ticks, and labels. Overrides *gridLines.display*, *scaleLabel.display*, and *ticks.display*.
+**gridLines** | Array | - | Options for the grid lines that run perpendicular to the axis.
+*gridLines*.display | Boolean | true |
+*gridLines*.color | Color | "rgba(0, 0, 0, 0.1)" | Color of the grid lines.
+*gridLines*.lineWidth | Number | 1 | Stroke width of grid lines
+*gridLines*.drawOnChartArea | Boolean | true | If true, draw lines on the chart area inside the axis lines. This is useful when there are multiple axes and you need to control which grid lines are drawn
+*gridLines*.drawTicks | Boolean | true |  If true, draw lines beside the ticks in the axis area beside the chart.
+*gridLines*.zeroLineWidth | Number | 1 | Stroke width of the grid line for the first index (index 0).
+*gridLines*.zeroLineColor | Color | "rgba(0, 0, 0, 0.25)" | Stroke color of the grid line for the first index (index 0).
+*gridLines*.offsetGridLines | Boolean | false | If true, offset labels from grid lines.
+**scaleLabel** | Array | | Title for the entire axis.
+*scaleLabel*.display | Boolean | false | 
+*scaleLabel*.labelString | String | "" | The text for the title. (i.e. "# of People", "Response Choices")
+*scaleLabel*.fontColor | Color | "#666" | Font color for the scale title.
+*scaleLabel*.fontFamily| String | "Helvetica Neue" | Font family for the scale title, follows CSS font-family options.
+*scaleLabel*.fontSize | Number | 12 | Font size for the scale title.
+*scaleLabel*.fontStyle | String | "normal" | Font style for the scale title, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+**ticks** | Array | | Settings for the labels that run along the axis.
+*ticks*.beginAtZero | Boolean | false | If true the scale will be begin at 0, if false the ticks will begin at your smallest data value.
+*ticks*.fontColor | Color | "#666" | Font color for the tick labels.
+*ticks*.fontFamily | String | "Helvetica Neue" | Font family for the tick labels, follows CSS font-family options.
+*ticks*.fontSize | Number | 12 | Font size for the tick labels.
+*ticks*.fontStyle | String | "normal" | Font style for the tick labels, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+*ticks*.maxRotation | Number | 90 | Maximum rotation for tick labels when rotating to condense labels. Note: Rotation doesn't occur until necessary. *Note: Only applicable to horizontal scales.*
+*ticks*.minRotation | Number |  20 | *currently not-implemented* Minimum rotation for tick labels when condensing is necessary.  *Note: Only applicable to horizontal scales.*
+*ticks*.padding | Number | 10 | Padding between the tick label and the axis. *Note: Only applicable to horizontal scales.*
+*ticks*.mirror | Boolean | false | Flips tick labels around axis, displaying the labels inside the chart instead of outside. *Note: Only applicable to vertical scales.*
+*ticks*.reverse | Boolean | false | Reverses order of tick labels.
+*ticks*.display | Boolean | true | If true, show the ticks.
+*ticks*.suggestedMin | Number | - | User defined minimum number for the scale, overrides minimum value *except for if* it is higher than the minimum value.
+*ticks*.suggestedMax | Number | - | User defined maximum number for the scale, overrides maximum value *except for if* it is lower than the maximum value.
+*ticks*.callback | Function | `function(value) { return '' + value; } ` | Returns the string representation of the tick value as it should be displayed on the chart.
+
+The `callback` method may be used for advanced tick customization. The following callback would display every label in scientific notation
+```javascript
+{
+    scales: {
+        xAxes: [{
+            ticks: {
+                // Return an empty string to draw the tick line but hide the tick label
+                // Return `null` or `undefined` to hide the tick line entirely
+               	userCallback: function(value, index, values) {
+    				return value.toExponential();
+    			}
+            }
+        }]
+    }
+}
+```
+
+#### Category Scale
+The category scale will be familiar to those who have used v1.0. Labels are drawn in from the labels array included in the chart data.
+
+The category scale extends the core scale class with the following tick template:
+
+```javascript
+{
+	position: "bottom",
+}
+```
+
+#### Linear Scale
+The linear scale can be used to display numerical data. It can be placed on either the x or y axis. The scatter chart type automatically configures a line chart to use one of these scales for the x axis.
+
+The linear scale extends the core scale class with the following tick template:
+
+```javascript
+{
+	position: "left",
+    ticks: {
+        callback: function(tickValue, index, ticks) {
+            var delta = ticks[1] - ticks[0];
+
+            // If we have a number like 2.5 as the delta, figure out how many decimal places we need
+            if (Math.abs(delta) > 1) {
+                if (tickValue !== Math.floor(tickValue)) {
+                    // not an integer
+                    delta = tickValue - Math.floor(tickValue);
+                }
+            }
+
+            var logDelta = helpers.log10(Math.abs(delta));
+            var tickString = '';
+
+            if (tickValue !== 0) {
+                var numDecimal = -1 * Math.floor(logDelta);
+                numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
+                tickString = tickValue.toFixed(numDecimal);
+            } else {
+            	tickString = '0'; // never show decimal places for 0
+            }
+
+      		return tickString;
+      	}
+    }
+}
+```
+
+#### Logarithmic Scale
+The logarithmic scale is used to display logarithmic data of course. It can be placed on either the x or y axis.
+
+The log scale extends the core scale class with the following tick template:
+
+```javascript
+{
+	position: "left",
+	ticks: {
+		callback: function(value) {
+			var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));
+
+        	if (remain === 1 || remain === 2 || remain === 5) {
+        		return value.toExponential();
+        	} else {
+        		return '';
+        	}
+        }
+	}
+}
+```
+
+#### Time Scale
+The time scale is used to display times and dates. It can be placed on the x axis. When building its ticks, it will automatically calculate the most comfortable unit base on the size of the scale.
+
+The time scale extends the core scale class with the following tick template:
+
+```javascript
+{
+	position: "bottom",
+	time: {
+		// string/callback - By default, date objects are expected. You may use a pattern string from http://momentjs.com/docs/#/parsing/string-format/ to parse a time string format, or use a callback function that is passed the label, and must return a moment() instance.
+		format: false,
+		// string - By default, unit will automatically be detected.  Override with 'week', 'month', 'year', etc. (see supported time measurements)
+		unit: false,
+		// string - By default, no rounding is applied.  To round, set to a supported time unit eg. 'week', 'month', 'year', etc.
+		round: false,
+		// Moment js for each of the units. Replaces `displayFormat`
+		// To override, use a pattern string from http://momentjs.com/docs/#/displaying/format/
+		displayFormats: {
+				'millisecond': 'SSS [ms]',
+				'second': 'h:mm:ss a', // 11:20:01 AM
+				'minute': 'h:mm:ss a', // 11:20:01 AM
+				'hour': 'MMM D, hA', // Sept 4, 5PM
+				'day': 'll', // Sep 4 2015
+				'week': 'll', // Week 46, or maybe "[W]WW - YYYY" ?
+				'month': 'MMM YYYY', // Sept 2015
+				'quarter': '[Q]Q - YYYY', // Q3
+				'year': 'YYYY', // 2015
+			}, 
+	},
+}
+```
+
+The following time measurements are supported:
+
+```javascript
+{
+	'millisecond': {
+		display: 'SSS [ms]', // 002 ms
+		maxStep: 1000,
+	},
+	'second': {
+		display: 'h:mm:ss a', // 11:20:01 AM
+		maxStep: 60,
+	},
+	'minute': {
+		display: 'h:mm:ss a', // 11:20:01 AM
+		maxStep: 60,
+	},
+	'hour': {
+		display: 'MMM D, hA', // Sept 4, 5PM
+		maxStep: 24,
+	},
+	'day': {
+		display: 'll', // Sep 4 2015
+		maxStep: 7,
+	},
+	'week': {
+		display: 'll', // Week 46, or maybe "[W]WW - YYYY" ?
+		maxStep: 4.3333,
+	},
+	'month': {
+		display: 'MMM YYYY', // Sept 2015
+		maxStep: 12,
+	},
+	'quarter': {
+		display: '[Q]Q - YYYY', // Q3
+		maxStep: 4,
+	},
+	'year': {
+		display: 'YYYY', // 2015
+		maxStep: false,
+	},
+}
+```
+
+#### Radial Linear Scale
+The radial linear scale is used specifically for the radar chart type.
+
+The radial linear scale extends the core scale class with the following tick template:
+
+```javascript
+{
+	animate: true,
+	lineArc: false,
+	position: "chartArea",
+
+	angleLines: {
+		display: true,
+		color: "rgba(0, 0, 0, 0.1)",
+		lineWidth: 1
+	},
+
+	// label settings
+	ticks: {
+		//Boolean - Show a backdrop to the scale label
+		showLabelBackdrop: true,
+
+		//String - The colour of the label backdrop
+		backdropColor: "rgba(255,255,255,0.75)",
+
+		//Number - The backdrop padding above & below the label in pixels
+		backdropPaddingY: 2,
+
+		//Number - The backdrop padding to the side of the label in pixels
+		backdropPaddingX: 2,
+
+		//Number - Limit the maximum number of ticks
+		maxTicksLimit: 11,
+	},
+
+	pointLabels: {
+		//String - Point label font declaration
+		fontFamily: "'Arial'",
+
+		//String - Point label font weight
+		fontStyle: "normal",
+
+		//Number - Point label font size in pixels
+		fontSize: 10,
+
+		//String - Point label font colour
+		fontColor: "#666",
+	},
+}
+```

docs/02-Line-Chart.md

@@ -15,7 +15,7 @@ Often, it is used to show trend data, and the comparison of two data sets.
 ```javascript
 var myLineChart = new Chart(ctx, {
 	type: 'line',
-	data: data, 
+	data: data,
 	options: options
 });
 ```
@@ -23,7 +23,7 @@ var myLineChart = new Chart(ctx, {
 Alternatively a line chart can be created using syntax similar to the v1.0 syntax
 ```javascript
 var myLineChart = Chart.Line(ctx, {
-	data: data, 
+	data: data,
 	options: options
 });
 ```
@@ -113,37 +113,22 @@ The label key on each dataset is optional, and can be used when generating a sca
 
 These are the customisation options specific to Line charts. These options are merged with the [global chart configuration options](#getting-started-global-chart-configuration), and form the options of the chart.
 
-```javascript
-{
-	// Boolean - if true, line stack on top of each other along the y axis
-	stacked: false,
+The default options for line chart are defined in `Chart.defaults.Line`.
 
-	hover: {
-		// String - We use a label hover mode since the x axis displays data by the index in the dataset
-		mode: "label"
-	},
-
-	scales: {
-		// Defines all of the x axes used in the chart. See the [scale documentation](#getting-started-scales) for details on the available options
-		xAxes: [{
-			// String - type of scale. Built in types are 'category' and 'linear'
-			type: 'category', 
-
-			// String - id of the axis so that data can bind to it
-    		id: "x-axis-1", // need an ID so datasets can reference the scale
-		}],
-
-		// Defines all of the y axes used in the chart.
-		// By default, the line chart uses a linear scale along the y axis
-		yAxes: [{
-			type: 'linear',
-
-			// String - ID of the axis for data binding
-    		id: "y-axis-1",
-		}],
-	}
-};
-```
+Name | Type | Default | Description
+--- | --- | --- | ---
+stacked | Boolean | false | If true, lines stack on top of each other along the y axis.
+*hover*.mode | String | "label" | Label's hover mode. "label" is used since the x axis displays data by the index in the dataset.
+scales | - | - | -
+*scales*.xAxes | Array | `[{type:"category","id":"x-axis-1"}]` | Defines all of the x axes used in the chart. See the [scale documentation](#getting-started-scales) for details on the available options.
+*Options for xAxes* | | |
+type | String | "category" | As defined in ["Category"](#scales-category-scale).
+id | String | "x-axis-1" | Id of the axis so that data can bind to it.
+ | | |
+ *scales*.yAxes | Array | `[{type:"linear","id":"y-axis-1"}]` | Defines all of the x axes used in the chart. See the [scale documentation](#getting-started-scales) for details on the available options.
+ *Options for yAxes* | | |
+ type | String | "linear" | As defined in ["Linear"](#scales-linear-scale).
+ id | String | "y-axis-1" | Id of the axis so that data can bind to it.
 
 You can override these for your `Chart` instance by passing a member `options` into the `Line` method.
 
@@ -152,10 +137,10 @@ For example, we could have a line chart display without an x axis by doing the f
 ```javascript
 new Chart(ctx, {
 	type: 'line',
-	data: data, 
+	data: data,
 	options: {
 		xAxes: [{
-			show: false
+			display: false
 		}]
 	}
 });
@@ -181,32 +166,16 @@ canvas.onclick = function(evt){
 
 This functionality may be useful for implementing DOM based tooltips, or triggering custom behaviour in your application.
 
+#### .getElementAtEvent( event )
+Calling `getElementAtEvent(event)` on your Chart instance passing an argument of an event, or jQuery event, will return the single element at the event position. If there are multiple items within range, only the first is returned
+
 #### .update( )
 
-Calling `update()` on your Chart instance will re-render the chart with any updated values, allowing you to edit the value of multiple existing points, then render those in one animated render loop.
+Calling `update()` on your Chart instance will re-render the chart with any updated values, allowing you to edit the value of multiple existing points, then render those in one animated render loop. You can safely call `update()` after changing the entire data object on the chart.
 
 ```javascript
-myLineChart.datasets[0].points[2].value = 50;
+myLineChart.data.datasets[0].data[2] = 50;
 // Would update the first dataset's value of 'March' to be 50
 myLineChart.update();
 // Calling update now animates the position of March from 90 to 50.
 ```
-
-#### .addData( valuesArray, label )
-
-Calling `addData(valuesArray, label)` on your Chart instance passing an array of values for each dataset, along with a label for those points.
-
-```javascript
-// The values array passed into addData should be one for each dataset in the chart
-myLineChart.addData([40, 60], "August");
-// This new data will now animate at the end of the chart.
-```
-
-#### .removeData( )
-
-Calling `removeData()` on your Chart instance will remove the first value for all datasets on the chart.
-
-```javascript
-myLineChart.removeData();
-// The chart will remove the first point and animate other points into place
-```

docs/03-Bar-Chart.md

@@ -14,8 +14,9 @@ It is sometimes used to show trend data, and the comparison of multiple data set
 
 ### Example usage
 ```javascript
-var myBarChart = new Chart(ctx).Bar({
-	data: data, 
+var myBarChart = new Chart(ctx,{
+	type: 'bar',
+	data: data,
 	options: options
 });
 ```
@@ -72,212 +73,111 @@ The label key on each dataset is optional, and can be used when generating a sca
 
 These are the customisation options specific to Bar charts. These options are merged with the [global chart configuration options](#getting-started-global-chart-configuration), and form the options of the chart.
 
-```javascript
-{
-	// Boolean - if true, bars stack on top of each other
-	stacked: false,
+The default options for bar chart are defined in `Chart.defaults.Bar`.
 
-	hover: {
-		// String - We use a label hover mode since the x axis displays data by the index in the dataset
-		mode: "label"
-	},
-
-	scales: {
-		// The bar chart officially supports only 1 x-axis but uses an array to keep the API consistent. Use a scatter chart if you need multiple x axes. 
-		xAxes: [{
-			// String - type of axis to use. Should not be changed from 'dataset'.
-			scaleType: "dataset", // scatter should not use a dataset axis
-
-			// Boolean - if true, show the scale
-			display: true,
-
-			// String - position of the scale. possible options are "top" and "bottom" for dataset scales
-			position: "bottom",
-
-			// String - id of the axis so that data can bind to it
-			id: "x-axis-1", // need an ID so datasets can reference the scale
-
-			// grid line settings
-			gridLines: {
-				// Boolean - if true, show the grid lines
-				show: true,
-
-				// String - color of the grid lines
-				color: "rgba(0, 0, 0, 0.05)",
-
-				// Number - width of the grid lines
-				lineWidth: 1,
-
-				// Boolean - if true draw lines on the chart area
-				drawOnChartArea: true,
-
-				// Boolean - if true draw ticks in the axis area
-				drawTicks: true,
-
-				// Number - width of the grid line for the first index (index 0)
-				zeroLineWidth: 1,
-
-				// String - color of the grid line for the first index
-				zeroLineColor: "rgba(0,0,0,0.25)",
-
-				// Boolean - if true, offset labels from grid lines
-				offsetGridLines: false,
-			},
-
-			// label settings
-			labels: {
-				// Boolean - if true show labels
-				show: true,
-
-				// String - template string for labels
-				template: "<%=value%>",
-
-				// Number - label font size
-				fontSize: 12,
-
-				// String - label font style
-				fontStyle: "normal",
-
-				// String - label font color
-				fontColor: "#666",
-
-				// String - label font family
-				fontFamily: "Helvetica Neue",
-			},
-		}],
-		yAxes: [{
-			// String - type of axis. 'linear' is the default but extensions may provide other types such as logarithmic
-			scaleType: "linear",
-
-			// Boolean - if true, show the scale
-			display: true,
-
-			// String - position of axis. Vertical axes can have either "left" or "right"
-			position: "left",
-
-			// ID of the axis for data binding
-			id: "y-axis-1",
-
-			// grid line settings
-			gridLines: {
-				// Boolean - if true, show the grid lines
-				show: true,
-
-				// String - color of the grid lines
-				color: "rgba(0, 0, 0, 0.05)",
-
-				// Number - width of the grid lines
-				lineWidth: 1,
-
-				// Boolean - if true draw lines on the chart area
-				drawOnChartArea: true,
-
-				// Boolean - if true draw ticks in the axis area
-				drawTicks: true,
-
-				// Number - width of the grid line representing a numerical value of 0
-				zeroLineWidth: 1,
-
-				// String - color of the grid line representing a numerical value of 0
-				zeroLineColor: "rgba(0,0,0,0.25)",
-			},
-
-			// Boolean - if true ensures that the scale always has a 0 point
-			beginAtZero: false,
-
-			// Object - if specified, allows the user to override the step generation algorithm.
-			//			Contains the following values
-			//				start: // number to start at
-			//				stepWidth: // size of step
-			//				steps: // number of steps
-			override: null,
-
-			// label settings
-			labels: {
-				// Boolean - if true show labels
-				show: true,
-
-				// String - template string for labels
-				template: "<%=value%>",
-
-				// Function - if specified this is passed the tick value, index, and the array of all tick values. Returns a string that is used as the label for that value
-				userCallback: null,
-
-				// Number - label font size
-				fontSize: 12,
-
-				// String - label font style
-				fontStyle: "normal",
-
-				// String - label font color
-				fontColor: "#666",
-
-				// String - label font family
-				fontFamily: "Helvetica Neue",
-			},
-		}],
-	},
-};
-```
+Name | Type | Default | Description
+--- |:---:| --- | ---
+stacked | Boolean | false |
+*hover*.mode | String | "label" | Label's hover mode. "label" is used since the x axis displays data by the index in the dataset.
+scales | Array | - | -
+*scales*.xAxes | Array |  | The bar chart officially supports only 1 x-axis but uses an array to keep the API consistent. Use a scatter chart if you need multiple x axes.
+*Options for xAxes* | | |
+type | String | "Category" | As defined in [Scales](#scales-category-scale).
+display | Boolean | true | If true, show the scale.
+position | String | "bottom" | Position of the scale. Options are "top" and "bottom" for dataset scales.
+id | String | "x-axis-1" | Id of the axis so that data can bind to it
+categoryPercentage | Number | 0.8 | Percent (0-1) of the available width (the space between the gridlines for small datasets) for each data-point to use for the bars. [Read More](#bar-chart-barpercentage-vs-categorypercentage)
+barPercentage | Number | 0.9 | Percent (0-1) of the available width each bar should be within the category percentage. 1.0 will take the whole category width and put the bars right next to each other. [Read More](#bar-chart-barpercentage-vs-categorypercentage)
+gridLines | Array |  [See Scales](#scales) |
+*gridLines*.offsetGridLines | Boolean | true | If true, the bars for a particular data point fall between the grid lines. If false, the grid line will go right down the middle of the bars.
+scaleLabel | Array | [See Scales](#scales) |
+ticks | Array |  [See Scales](#scales) |
+| | |
+*scales*.yAxes | Array | `[{ type: "linear" }]` |
+*Options for xAxes* | | |
+type | String | "linear" | As defined in [Scales](#scales-linear-scale).
+display | Boolean | true | If true, show the scale.
+position | String | "left" | Position of the scale. Options are "left" and "right" for dataset scales.
+id | String | "y-axis-1" | Id of the axis so that data can bind to it.
+gridLines | Array |  [See Scales](#scales) |
+scaleLabel | Array | [See Scales](#scales) |
+ticks | Array |  [See Scales](#scales) |
 
 You can override these for your `Chart` instance by passing a second argument into the `Bar` method as an object with the keys you want to override.
 
 For example, we could have a bar chart without a stroke on each bar by doing the following:
 
 ```javascript
-new Chart(ctx).Bar({
-	data: data, 
+new Chart(ctx,{
+	type:"bar",
+	data: data,
 	options: {
-		barShowStroke: false
+		scales: {
+				xAxes: [{
+						stacked: true,
+				}],
+				yAxes: [{
+						stacked: true
+				}]
+			}
+		}
 	}
 });
 // This will create a chart with all of the default options, merged from the global config,
-//  and the Bar chart defaults but this particular instance will have `barShowStroke` set to false.
+//  and the Bar chart defaults but this particular instance will have `stacked` set to true
+// for both x and y axes.
 ```
 
 We can also change these defaults values for each Bar type that is created, this object is available at `Chart.defaults.Bar`.
 
+#### barPercentage vs categoryPercentage
+
+The following shows the relationship between the bar percentage option and the category percentage option.
+
+```text
+// categoryPercentage: 1.0
+// barPercentage: 1.0
+Bar:          | 1.0 | 1.0 |
+Category: 	|    1.0    |   
+Sample:	   |===========|
+
+// categoryPercentage: 1.0
+// barPercentage: 0.5
+Bar:             |.5|  |.5|
+Category: 	|      1.0     |   
+Sample:	   |==============|
+
+// categoryPercentage: 0.5
+// barPercentage: 1.0
+Bar:              |1.||1.|
+Category:     	|  .5  |   
+Sample:	   |==============|
+```
 ### Prototype methods
 
-#### .getBarsAtEvent( event )
+#### .getElementsAtEvent( event )
 
-Calling `getBarsAtEvent(event)` on your Chart instance passing an argument of an event, or jQuery event, will return the bar elements that are at that the same position of that event.
+Calling `getElementsAtEvent(event)` on your Chart instance passing an argument of an event, or jQuery event, will return the point elements that are at that the same position of that event.
 
 ```javascript
 canvas.onclick = function(evt){
-	var activeBars = myBarChart.getBarsAtEvent(evt);
-	// => activeBars is an array of bars on the canvas that are at the same position as the click event.
+	var activePoints = myLineChart.getElementsAtEvent(evt);
+	// => activePoints is an array of points on the canvas that are at the same position as the click event.
 };
 ```
 
 This functionality may be useful for implementing DOM based tooltips, or triggering custom behaviour in your application.
 
+#### .getElementAtEvent( event )
+Calling `getElementAtEvent(event)` on your Chart instance passing an argument of an event, or jQuery event, will return the single element at the event position. If there are multiple items within range, only the first is returned
+
 #### .update( )
 
 Calling `update()` on your Chart instance will re-render the chart with any updated values, allowing you to edit the value of multiple existing points, then render those in one animated render loop.
 
 ```javascript
-myBarChart.datasets[0].bars[2].value = 50;
+myBarChart.data.datasets[0].data[2] = 50;
 // Would update the first dataset's value of 'March' to be 50
 myBarChart.update();
 // Calling update now animates the position of March from 90 to 50.
-```
-
-#### .addData( valuesArray, label )
-
-Calling `addData(valuesArray, label)` on your Chart instance passing an array of values for each dataset, along with a label for those bars.
-
-```javascript
-// The values array passed into addData should be one for each dataset in the chart
-myBarChart.addData([40, 60], "August");
-// The new data will now animate at the end of the chart.
-```
-
-#### .removeData( )
-
-Calling `removeData()` on your Chart instance will remove the first value for all datasets on the chart.
-
-```javascript
-myBarChart.removeData();
-// The chart will now animate and remove the first bar
-```
+```

docs/04-Radar-Chart.md

@@ -15,7 +15,11 @@ They are often useful for comparing the points of two or more different data set
 ###Example usage
 
 ```javascript
-var myRadarChart = new Chart(ctx).Radar(data, options);
+var myRadarChart = new Chart(ctx,{
+	type:'radar',
+	data: data,
+	options: options
+});
 ```
 
 ###Data structure
@@ -25,22 +29,22 @@ var data = {
 	datasets: [
 		{
 			label: "My First dataset",
-			fillColor: "rgba(220,220,220,0.2)",
-			strokeColor: "rgba(220,220,220,1)",
-			pointColor: "rgba(220,220,220,1)",
-			pointStrokeColor: "#fff",
-			pointHighlightFill: "#fff",
-			pointHighlightStroke: "rgba(220,220,220,1)",
+			backgroundColor: "rgba(220,220,220,0.2)",
+			borderColor: "rgba(220,220,220,1)",
+			pointBackgroundColor: "rgba(220,220,220,1)",
+			pointBorderColor: "#fff",
+			pointHoverBackgroundColor: "#fff",
+			pointHoverBorderColor: "rgba(220,220,220,1)",
 			data: [65, 59, 90, 81, 56, 55, 40]
 		},
 		{
 			label: "My Second dataset",
-			fillColor: "rgba(151,187,205,0.2)",
-			strokeColor: "rgba(151,187,205,1)",
-			pointColor: "rgba(151,187,205,1)",
-			pointStrokeColor: "#fff",
-			pointHighlightFill: "#fff",
-			pointHighlightStroke: "rgba(151,187,205,1)",
+			backgroundColor: "rgba(151,187,205,0.2)",
+			borderColor: "rgba(151,187,205,1)",
+			pointBackgroundColor: "rgba(151,187,205,1)",
+			pointBorderColor: "#fff",
+			pointHoverBackgroundColor: "#fff",
+			pointHoverBorderColor: "rgba(151,187,205,1)",
 			data: [28, 48, 40, 19, 96, 27, 100]
 		}
 	]
@@ -55,77 +59,35 @@ The label key on each dataset is optional, and can be used when generating a sca
 
 These are the customisation options specific to Radar charts. These options are merged with the [global chart configuration options](#getting-started-global-chart-configuration), and form the options of the chart.
 
+The default options for radar chart are defined in `Chart.defaults.radar`.
 
-```javascript
-{
-	//Boolean - Whether to show lines for each scale point
-	scaleShowLine : true,
-
-	//Boolean - Whether we show the angle lines out of the radar
-	angleShowLineOut : true,
-
-	//Boolean - Whether to show labels on the scale
-	scaleShowLabels : false,
-
-	// Boolean - Whether the scale should begin at zero
-	scaleBeginAtZero : true,
-
-	//String - Colour of the angle line
-	angleLineColor : "rgba(0,0,0,.1)",
-
-	//Number - Pixel width of the angle line
-	angleLineWidth : 1,
-
-	//String - Point label font declaration
-	pointLabelFontFamily : "'Arial'",
-
-	//String - Point label font weight
-	pointLabelFontStyle : "normal",
-
-	//Number - Point label font size in pixels
-	pointLabelFontSize : 10,
-
-	//String - Point label font colour
-	pointLabelFontColor : "#666",
-
-	//Boolean - Whether to show a dot for each point
-	pointDot : true,
-
-	//Number - Radius of each point dot in pixels
-	pointDotRadius : 3,
-
-	//Number - Pixel width of point dot stroke
-	pointDotStrokeWidth : 1,
-
-	//Number - amount extra to add to the radius to cater for hit detection outside the drawn point
-	pointHitDetectionRadius : 20,
-
-	//Boolean - Whether to show a stroke for datasets
-	datasetStroke : true,
-
-	//Number - Pixel width of dataset stroke
-	datasetStrokeWidth : 2,
-
-	//Boolean - Whether to fill the dataset with a colour
-	datasetFill : true,
-	{% raw %}
-	//String - A legend template
-	legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].strokeColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
-	{% endraw %}
-}
-```
-
+Name | Type | Default | Description
+--- | --- | --- | ---
+scale | Array | [See Scales](#scales) and [Defaults for Radial Linear Scale](#scales-radial-linear-scale) | Options for the one scale used on the chart. Use this to style the ticks, labels, and grid lines.
+*scale*.type | String |"radialLinear" | As defined in ["Radial Linear"](#scales-radial-linear-scale).
+*elements*.line | Array | | Options for all line elements used on the chart, as defined in the global elements, duplicated here to show Radar chart specific defaults.
+*elements.line*.tension | Number | 0 | Tension exhibited by lines when calculating splineCurve.
 
 You can override these for your `Chart` instance by passing a second argument into the `Radar` method as an object with the keys you want to override.
 
 For example, we could have a radar chart without a point for each on piece of data by doing the following:
 
 ```javascript
-new Chart(ctx).Radar(data, {
-	pointDot: false
+new Chart(ctx, {
+	type:"radar",
+	data: data,
+	options: {
+			scale: {
+				reverse: true,
+				ticks: {
+					beginAtZero: true
+				}
+			}
+	}
 });
 // This will create a chart with all of the default options, merged from the global config,
-//  and the Bar chart defaults but this particular instance will have `pointDot` set to false.
+//  and the Radar chart defaults but this particular instance's scale will be reversed as
+// well as the ticks beginning at zero.
 ```
 
 We can also change these defaults values for each Radar type that is created, this object is available at `Chart.defaults.Radar`.
@@ -174,4 +136,4 @@ Calling `removeData()` on your Chart instance will remove the first value for al
 ```javascript
 myRadarChart.removeData();
 // Other points will now animate to their correct positions.
-```
+```

docs/05-Polar-Area-Chart.md

@@ -60,52 +60,13 @@ As you can see, for the chart data you pass in an array of objects, with a value
 
 These are the customisation options specific to Polar Area charts. These options are merged with the [global chart configuration options](#getting-started-global-chart-configuration), and form the options of the chart.
 
-```javascript
-{
-	//Boolean - Show a backdrop to the scale label
-	scaleShowLabelBackdrop : true,
-
-	//String - The colour of the label backdrop
-	scaleBackdropColor : "rgba(255,255,255,0.75)",
-
-	// Boolean - Whether the scale should begin at zero
-	scaleBeginAtZero : true,
-
-	//Number - The backdrop padding above & below the label in pixels
-	scaleBackdropPaddingY : 2,
-
-	//Number - The backdrop padding to the side of the label in pixels
-	scaleBackdropPaddingX : 2,
-
-	//Boolean - Show line for each value in the scale
-	scaleShowLine : true,
-
-	//Boolean - Stroke a line around each segment in the chart
-	segmentShowStroke : true,
-
-	//String - The colour of the stroke on each segment.
-	segmentStrokeColor : "#fff",
-
-	//Number - The width of the stroke value in pixels
-	segmentStrokeWidth : 2,
-
-	//Number - Amount of animation steps
-	animationSteps : 100,
-
-	//String - Animation easing effect.
-	animationEasing : "easeOutBounce",
-
-	//Boolean - Whether to animate the rotation of the chart
-	animateRotate : true,
-
-	//Boolean - Whether to animate scaling the chart from the centre
-	animateScale : false,
-	{% raw %}
-	//String - A legend template
-	legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
-	{% endraw %}
-}
-```
+Name | Type | Default | Description
+--- | --- | --- | ---
+scale | Array | [See Scales](#scales) and [Defaults for Radial Linear Scale](#getting-started-radial-linear-scale) | Options for the one scale used on the chart. Use this to style the ticks, labels, and grid.
+*scale*.type | String |"radialLinear" | As defined in ["Radial Linear"](#scales-radial-linear-scale).
+*scale*.lineArc | Boolean | true | When true, lines are circular.
+*animation*.animateRotate | Boolean |true | If true, will animate the rotation of the chart.
+*animation*.animateScale | Boolean | true | If true, will animate scaling the chart.
 
 You can override these for your `Chart` instance by passing a second argument into the `PolarArea` method as an object with the keys you want to override.
 

docs/06-Pie-Doughnut-Chart.md

@@ -24,35 +24,44 @@ They are also registered under two aliases in the `Chart` core. Other than their
 
 ```javascript
 // For a pie chart
-var myPieChart = new Chart(ctx[0]).Pie(data,options);
+var myPieChart = new Chart(ctx[0],{
+	type:'pie',
+	data: data,
+	options: options
+});
 
 // And for a doughnut chart
-var myDoughnutChart = new Chart(ctx[1]).Doughnut(data,options);
+var myDoughnutChart = new Chart(ctx[1], {
+	type:'doughnut',
+	data: data,
+	options: options
+});
 ```
 
 ### Data structure
 
 ```javascript
-var data = [
-	{
-		value: 300,
-		color:"#F7464A",
-		highlight: "#FF5A5E",
-		label: "Red"
-	},
-	{
-		value: 50,
-		color: "#46BFBD",
-		highlight: "#5AD3D1",
-		label: "Green"
-	},
-	{
-		value: 100,
-		color: "#FDB45C",
-		highlight: "#FFC870",
-		label: "Yellow"
-	}
-]
+var data = {
+    labels: [
+        "Red",
+        "Green",
+        "Yellow"
+    ],
+    datasets: [
+        {
+            data: [300, 50, 100],
+            backgroundColor: [
+                "#F7464A",
+                "#46BFBD",
+                "#FDB45C"
+            ],
+            hoverBackgroundColor: [
+                "#FF5A5E",
+                "#5AD3D1",
+                "#FFC870"
+            ]
+        }]
+};
 ```
 
 For a pie chart, you must pass in an array of objects with a value and an optional color property. The value attribute should be a number, Chart.js will total all of the numbers and calculate the relative proportion of each. The color attribute should be a string. Similar to CSS, for this string you can use HEX notation, RGB, RGBA or HSL.
@@ -61,44 +70,25 @@ For a pie chart, you must pass in an array of objects with a value and an option
 
 These are the customisation options specific to Pie & Doughnut charts. These options are merged with the [global chart configuration options](#getting-started-global-chart-configuration), and form the options of the chart.
 
-```javascript
-{
-	//Boolean - Whether we should show a stroke on each segment
-	segmentShowStroke : true,
+Name | Type | Default | Description
+--- | --- | --- | ---
+cutoutPercentage | Number | 50 - for doughnut, 0 - for pie | The percentage of the chart that is cut out of the middle.
+scale | Array | [See Scales](#scales) and [Defaults for Radial Linear Scale](#getting-started-radial-linear-scale) | Options for the one scale used on the chart. Use this to style the ticks, labels, and grid.
+*scale*.type | String |"radialLinear" | As defined in ["Radial Linear"](#scales-radial-linear-scale).
+*scale*.lineArc | Boolean | true | When true, lines are arced compared to straight when false.
+*animation*.animateRotate | Boolean |true | If true, will animate the rotation of the chart.
+*animation*.animateScale | Boolean | false | If true, will animate scaling the Doughnut from the centre.
 
-	//String - The colour of each segment stroke
-	segmentStrokeColor : "#fff",
-
-	//Number - The width of each segment stroke
-	segmentStrokeWidth : 2,
-
-	//Number - The percentage of the chart that we cut out of the middle
-	percentageInnerCutout : 50, // This is 0 for Pie charts
-
-	//Number - Amount of animation steps
-	animationSteps : 100,
-
-	//String - Animation easing effect
-	animationEasing : "easeOutBounce",
-
-	//Boolean - Whether we animate the rotation of the Doughnut
-	animateRotate : true,
-
-	//Boolean - Whether we animate scaling the Doughnut from the centre
-	animateScale : false,
-	{% raw %}
-	//String - A legend template
-	legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
-	{% endraw %}
-}
-```
 You can override these for your `Chart` instance by passing a second argument into the `Doughnut` method as an object with the keys you want to override.
 
 For example, we could have a doughnut chart that animates by scaling out from the centre like so:
 
 ```javascript
-new Chart(ctx).Doughnut(data, {
-	animateScale: true
+new Chart(ctx,{
+	type:"doughnut",
+	animation:{
+		animateScale:true
+	}
 });
 // This will create a chart with all of the default options, merged from the global config,
 // and the Doughnut chart defaults but this particular instance will have `animateScale` set to `true`.

gulpfile.js

@@ -27,7 +27,6 @@ var srcFiles = [
 	'./node_modules/color/dist/color.min.js',
 	'./src/core/core.js',
 	'./src/core/core.helpers.js',
-	'./src/core/core.chart.js',
 	'./src/core/core.element.js',
 	'./src/core/**',
 	'./src/controllers/**',
@@ -36,8 +35,11 @@ var srcFiles = [
 	'./src/charts/**',
 ];
 
-var testFiles = [
+var preTestFiles = [
 	'./node_modules/moment/min/moment.min.js',
+];
+
+var testFiles = [
 	'./test/mockContext.js',
 	'./test/*.js'
 ];
@@ -117,7 +119,7 @@ function releaseTask() {
 
 
 function jshintTask() {
-	return gulp.src(srcDir + '*.js')
+	return gulp.src(srcDir + '**/*.js')
 		.pipe(jshint())
 		.pipe(jshint.reporter('default'));
 }
@@ -131,17 +133,19 @@ function validHTMLTask() {
 
 function unittestTask() {
 	var files = srcFiles.slice();
+	Array.prototype.unshift.apply(files, preTestFiles);
 	Array.prototype.push.apply(files, testFiles);
 
 	return gulp.src(files)
 		.pipe(karma({
-			configFile: 'karma.conf.js',
+			configFile: 'karma.conf.ci.js',
 			action: 'run'
 		}));
 }
 
 function unittestWatchTask() {
 	var files = srcFiles.slice();
+	Array.prototype.unshift.apply(files, preTestFiles);
 	Array.prototype.push.apply(files, testFiles);
 
 	return gulp.src(files)
@@ -153,6 +157,7 @@ function unittestWatchTask() {
 
 function coverageTask() {
 	var files = srcFiles.slice();
+	Array.prototype.unshift.apply(files, preTestFiles);
 	Array.prototype.push.apply(files, testFiles);
 
 	return gulp.src(files)

karma.conf.ci.js

@@ -0,0 +1,19 @@
+module.exports = function(config) {
+	var configuration = {
+		browsers: ['Firefox'],
+		customLaunchers: {
+			Chrome_travis_ci: {
+				base: 'Chrome',
+				flags: ['--no-sandbox']
+			}
+		},
+		frameworks: ['jasmine'],
+		reporters: ['progress', 'html'],
+	};
+
+	if (process.env.TRAVIS) {
+		configuration.browsers.push('Chrome_travis_ci');
+	}
+
+	config.set(configuration);
+};

package.json

@@ -2,13 +2,12 @@
   "name": "chart.js",
   "homepage": "http://www.chartjs.org",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "2.0.0-alpha",
+  "version": "2.0.0-beta",
   "main": "Chart.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnnick/Chart.js.git"
   },
-  "dependences": {},
   "devDependencies": {
     "color": "git://github.com/chartjs/color",
     "gulp": "3.5.x",

samples/bar-stacked.html

@@ -43,6 +43,9 @@
                 type: 'bar',
                 data: barChartData,
                 options: {
+                    tooltips: {
+                        mode: 'label'
+                    },
                     responsive: true,
                     scales: {
                         xAxes: [{

samples/bar.html

@@ -45,6 +45,7 @@
                 backgroundColor: "rgba(220,220,220,0.5)",
                 data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
             }, {
+                hidden: true,
                 label: 'Dataset 2',
                 backgroundColor: "rgba(151,187,205,0.5)",
                 data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]

samples/bubble.html

@@ -0,0 +1,206 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>Bar Chart</title>
+    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+    <script src="../Chart.js"></script>
+    <style type="text/css">
+        canvas {
+            border: 1px solid red;
+        }
+    </style>
+</head>
+
+<body>
+    <div id="container" style="width: 100%; height: 25%;">
+        <canvas id="canvas"></canvas>
+    </div>
+    <button id="randomizeData">Randomize Data</button>
+    <button id="addDataset">Add Dataset</button>
+    <button id="removeDataset">Remove Dataset</button>
+    <button id="addData">Add Data</button>
+    <button id="removeData">Remove Data</button>
+    <button id="show">Show</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+        </div>
+    </div>
+    <script>
+        var randomScalingFactor = function() {
+            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
+        };
+        var randomColorFactor = function() {
+            return Math.round(Math.random() * 255);
+        };
+        var randomColor = function() {
+            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
+        };
+
+        var bubbleChartData = {
+            animation: {
+                duration: 10000
+            },
+            datasets: [{
+                label: "My First dataset",
+                backgroundColor: randomColor(),
+                data: [{
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }]
+            }, {
+                label: "My Second dataset",
+                backgroundColor: randomColor(),
+                data: [{
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }]
+            }]
+
+        };
+
+        function updateLegend() {
+            $legendContainer = $('#legendContainer');
+            $legendContainer.empty();
+            $legendContainer.append(window.myChart.generateLegend());
+        }
+
+        window.onload = function() {
+            var ctx = document.getElementById("canvas").getContext("2d");
+            window.myChart = new Chart(ctx, {
+                type: 'bubble',
+                data: bubbleChartData,
+                options: {
+                    responsive: true,
+                }
+            });
+
+            updateLegend();
+        };
+
+        $('#randomizeData').click(function() {
+            var zero = Math.random() < 0.2 ? true : false;
+            $.each(bubbleChartData.datasets, function(i, dataset) {
+                dataset.backgroundColor = randomColor();
+                dataset.data = dataset.data.map(function() {
+                    return {
+                        x: randomScalingFactor(),
+                        y: randomScalingFactor(),
+                        r: Math.abs(randomScalingFactor()) / 5,
+                    };
+                });
+            });
+            window.myChart.update();
+            updateLegend();
+        });
+
+        $('#addDataset').click(function() {
+            var newDataset = {
+                backgroundColor: randomColor(),
+                data: []
+            };
+
+            for (var index = 0; index < bubbleChartData.datasets[0].data.length; ++index) {
+                newDataset.data.push({
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                });
+            }
+
+            bubbleChartData.datasets.push(newDataset);
+            window.myChart.update();
+            updateLegend();
+        });
+
+        $('#addData').click(function() {
+            if (bubbleChartData.datasets.length > 0) {
+
+                for (var index = 0; index < bubbleChartData.datasets.length; ++index) {
+                    //window.myChart.addData(randomScalingFactor(), index);
+                    bubbleChartData.datasets[index].data.push({
+                        x: randomScalingFactor(),
+                        y: randomScalingFactor(),
+                        r: Math.abs(randomScalingFactor()) / 5,
+                    });
+                }
+
+                window.myChart.update();
+                updateLegend();
+            }
+        });
+
+        $('#removeDataset').click(function() {
+            bubbleChartData.datasets.splice(0, 1);
+            window.myChart.update();
+            updateLegend();
+        });
+
+        $('#removeData').click(function() {
+
+            bubbleChartData.datasets.forEach(function(dataset, datasetIndex) {
+                dataset.data.pop();
+            });
+
+            window.myChart.update();
+            updateLegend();
+        });
+
+        $('#show').click(function() {
+            document.getElementById('container').style.display = '';
+        });
+    </script>
+</body>
+
+</html>

samples/combo-bar-line.html

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Bar Chart</title>
+    <title>Combo Bar-Line Chart</title>
     <script src="../node_modules/jquery/dist/jquery.min.js"></script>
     <script src="../Chart.js"></script>
 </head>
@@ -30,14 +30,14 @@
                 borderColor: 'white',
                 borderWidth: 2
             }, {
-                type: 'bar',
+                type: 'line',
                 label: 'Dataset 2',
                 backgroundColor: "rgba(151,187,205,0.5)",
                 data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
                 borderColor: 'white',
                 borderWidth: 2
             }, {
-                type: 'line',
+                type: 'bar',
                 label: 'Dataset 3',
                 backgroundColor: "rgba(220,220,220,0.5)",
                 data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]

samples/doughnut.html

@@ -18,8 +18,8 @@
 </head>
 
 <body>
-    <div id="canvas-holder" style="width:50%">
-        <canvas id="chart-area" width="500" height="500" />
+    <div id="canvas-holder" style="width:100%">
+        <canvas id="chart-area" />
     </div>
     <button id="randomizeData">Randomize Data</button>
     <button id="addDataset">Add Dataset</button>
@@ -61,6 +61,7 @@
                     "#4D5360",
                 ],
             }, {
+                hidden: true,
                 data: [
                     randomScalingFactor(),
                     randomScalingFactor(),

samples/line-customTooltips.html

@@ -2,149 +2,143 @@
 <html>
 
 <head>
-    <title>Line Chart with Custom Tooltips</title>
-    <script src="../Chart.js"></script>
-    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-    <style>
+  <title>Line Chart with Custom Tooltips</title>
+  <script src="../Chart.js"></script>
+  <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+  <style>
     #canvas-holder1 {
-        width: 300px;
-        margin: 20px auto;
+      width: 300px;
+      margin: 20px auto;
     }
-    
+
     #canvas-holder2 {
-        width: 50%;
-        margin: 20px 25%;
+      width: 50%;
+      margin: 20px 25%;
     }
-    
+
     #chartjs-tooltip {
-        opacity: 1;
-        position: absolute;
-        background: rgba(0, 0, 0, .7);
-        color: white;
-        border-radius: 3px;
-        -webkit-transition: all .1s ease;
-        transition: all .1s ease;
-        pointer-events: none;
-        -webkit-transform: translate(-50%, 0);
-        transform: translate(-50%, 0);
+      opacity: 1;
+      position: absolute;
+      background: rgba(0, 0, 0, .7);
+      color: white;
+      border-radius: 3px;
+      -webkit-transition: all .1s ease;
+      transition: all .1s ease;
+      pointer-events: none;
+      -webkit-transform: translate(-50%, 0);
+      transform: translate(-50%, 0);
     }
-    
+
     .chartjs-tooltip-key {
-        display: inline-block;
-        width: 10px;
-        height: 10px;
+      display: inline-block;
+      width: 10px;
+      height: 10px;
     }
-    </style>
+  </style>
 </head>
 
 <body>
-    <div id="canvas-holder1">
-        <canvas id="chart1" width="300" height="30" />
-    </div>
-    <script>
+  <div id="canvas-holder1">
+    <canvas id="chart1" width="300" height="100" />
+  </div>
+  <script>
+    window.count = 0;
     Chart.defaults.global.pointHitDetectionRadius = 1;
     var customTooltips = function(tooltip) {
 
-        console.log(tooltip._view);
+      console.log(window.count++, tooltip);
 
-        // Tooltip Element
-        var tooltipEl = $('#chartjs-tooltip');
+      // Tooltip Element
+      var tooltipEl = $('#chartjs-tooltip');
 
-        if (!tooltipEl[0]) {
-            $('body').append('<div id="chartjs-tooltip"></div>');
-            tooltipEl = $('#chartjs-tooltip');
-        }
+      if (!tooltipEl[0]) {
+        $('body').append('<div id="chartjs-tooltip"></div>');
+        tooltipEl = $('#chartjs-tooltip');
+      }
 
-        // Hide if no tooltip
-        if (!tooltip._view.opacity) {
-            tooltipEl.css({
-                opacity: 0
-            });
-            $('.chartjs-wrap canvas')
-                .each(function(index, el) {
-                    $(el).css('cursor', 'default');
-                });
-            return;
-        }
-
-        $(tooltip._chart.canvas).css('cursor', 'pointer');
-
-        // Set caret Position
-        tooltipEl.removeClass('above below no-transform');
-        if (tooltip._view.yAlign) {
-            tooltipEl.addClass(tooltip._view.yAlign);
-        } else {
-            tooltipEl.addClass('no-transform');
-        }
-
-        // Set Text
-        if (tooltip._view.text) {
-            tooltipEl.html(tooltip._view.text);
-        } else if (tooltip._view.labels) {
-            var innerHtml = '<div class="title">' + tooltip._view.title + '</div>';
-            for (var i = 0; i < tooltip._view.labels.length; i++) {
-                innerHtml += [
-                    '<div class="section">',
-                    '   <span class="key" style="background-color:' + tooltip._view.legendColors[i].fill + '"></span>',
-                    '   <span class="value">' + tooltip._view.labels[i] + '</span>',
-                    '</div>'
-                ].join('');
-            }
-            tooltipEl.html(innerHtml);
-        }
-
-        // Find Y Location on page
-        var top = 0;
-        if (tooltip._view.yAlign) {
-            if (tooltip._view.yAlign == 'above') {
-                top = tooltip._view.y - tooltip._view.caretHeight - tooltip._view.caretPadding;
-            } else {
-                top = tooltip._view.y + tooltip._view.caretHeight + tooltip._view.caretPadding;
-            }
-        }
-
-        var offset = $(tooltip._chart.canvas).offset();
-
-        // Display, position, and set styles for font
+      // Hide if no tooltip
+      if (!tooltip.opacity) {
         tooltipEl.css({
-            opacity: 1,
-            width: tooltip._view.width ? (tooltip._view.width + 'px') : 'auto',
-            left: offset.left + tooltip._view.x + 'px',
-            top: offset.top + top + 'px',
-            fontFamily: tooltip._view._fontFamily,
-            fontSize: tooltip._view.fontSize,
-            fontStyle: tooltip._view._fontStyle,
-            padding: tooltip._view.yPadding + 'px ' + tooltip._view.xPadding + 'px',
+          opacity: 0
         });
+        $('.chartjs-wrap canvas')
+          .each(function(index, el) {
+            $(el).css('cursor', 'default');
+          });
+        return;
+      }
+
+      $(this._chart.canvas).css('cursor', 'pointer');
+
+      // Set caret Position
+      tooltipEl.removeClass('above below no-transform');
+      if (tooltip.yAlign) {
+        tooltipEl.addClass(tooltip.yAlign);
+      } else {
+        tooltipEl.addClass('no-transform');
+      }
+
+      // Set Text
+      if (tooltip.body) {
+        var innerHtml = [
+          (tooltip.beforeTitle || []).join('\n'), (tooltip.title || []).join('\n'), (tooltip.afterTitle || []).join('\n'), (tooltip.beforeBody || []).join('\n'), (tooltip.body || []).join('\n'), (tooltip.afterBody || []).join('\n'), (tooltip.beforeFooter || [])
+          .join('\n'), (tooltip.footer || []).join('\n'), (tooltip.afterFooter || []).join('\n')
+        ];
+        tooltipEl.html(innerHtml.join('\n'));
+      }
+
+      // Find Y Location on page
+      var top = 0;
+      if (tooltip.yAlign) {
+        if (tooltip.yAlign == 'above') {
+          top = tooltip.y - tooltip.caretHeight - tooltip.caretPadding;
+        } else {
+          top = tooltip.y + tooltip.caretHeight + tooltip.caretPadding;
+        }
+      }
+
+      var offset = $(this._chart.canvas).offset();
+
+      // Display, position, and set styles for font
+      tooltipEl.css({
+        opacity: 1,
+        width: tooltip.width ? (tooltip.width + 'px') : 'auto',
+        left: offset.left + tooltip.x + 'px',
+        top: offset.top + top + 'px',
+        fontFamily: tooltip._fontFamily,
+        fontSize: tooltip.fontSize,
+        fontStyle: tooltip._fontStyle,
+        padding: tooltip.yPadding + 'px ' + tooltip.xPadding + 'px',
+      });
     };
     var randomScalingFactor = function() {
-        return Math.round(Math.random() * 100);
+      return Math.round(Math.random() * 100);
     };
     var lineChartData = {
-        labels: ["January", "February", "March", "April", "May", "June", "July"],
-        datasets: [{
-            label: "My First dataset",
-            data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
-        }, {
-            label: "My Second dataset",
-            data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
-        }]
+      labels: ["January", "February", "March", "April", "May", "June", "July"],
+      datasets: [{
+        label: "My First dataset",
+        data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+      }, {
+        label: "My Second dataset",
+        data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+      }]
     };
 
     window.onload = function() {
-        var chartEl = document.getElementById("chart1");
-        window.myLine = new Chart(chartEl, {
-            type: 'line',
-            data: lineChartData,
-            options: {
-                tooltips: {
-                    enabled: false,
-                    custom: customTooltips
-                }
-            }
-        });
+      var chartEl = document.getElementById("chart1");
+      window.myLine = new Chart(chartEl, {
+        type: 'line',
+        data: lineChartData,
+        options: {
+          tooltips: {
+            enabled: false,
+            custom: customTooltips
+          }
+        }
+      });
     };
-    </script>
+  </script>
 </body>
 
 </html>

samples/line-logarithmic.html

@@ -60,7 +60,7 @@
                 xAxes: [{
                     display: true,
                     scaleLabel: {
-                        show: true,
+                        display: true,
                         labelString: 'x axis'
                     }
                 }],
@@ -68,7 +68,7 @@
                     display: true,
                     type: 'logarithmic',
                     scaleLabel: {
-                        show: true,
+                        display: true,
                         labelString: 'y axis'
                     }
                 }]

samples/line-skip-points.html

@@ -0,0 +1,175 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>Line Chart</title>
+    <script src="../Chart.js"></script>
+    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+    <style>
+        canvas {
+            -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
+        }
+    </style>
+</head>
+
+<body>
+    <div style="width:100%;">
+        <canvas id="canvas" style="width:100%;height:100%"></canvas>
+    </div>
+    <br>
+    <br>
+    <button id="randomizeData">Randomize Data</button>
+    <button id="addDataset">Add Dataset</button>
+    <button id="removeDataset">Remove Dataset</button>
+    <button id="addData">Add Data</button>
+    <button id="removeData">Remove Data</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+        </div>
+    </div>
+    <script>
+        var randomScalingFactor = function() {
+            return Math.round(Math.random() * 100);
+            //return 0;
+        };
+        var randomColorFactor = function() {
+            return Math.round(Math.random() * 255);
+        };
+        var randomColor = function(opacity) {
+            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '.3') + ')';
+        };
+
+        var config = {
+            type: 'line',
+            data: {
+                labels: ["January", "February", "March", "April", "May", "June", "July"],
+                datasets: [{
+                    label: "My First dataset",
+
+                    // Skip a point in the middle
+                    data: [randomScalingFactor(), randomScalingFactor(), NaN, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                    fill: true,
+                    borderDash: [5, 5],
+                }, {
+                    label: "My Second dataset",
+
+                    // Skip first and last points
+                    data: [NaN, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), NaN],
+                }]
+            },
+            options: {
+                responsive: true,
+                tooltips: {
+                    mode: 'label',
+                },
+                hover: {
+                    mode: 'label'
+                },
+                scales: {
+                    xAxes: [{
+                        display: true,
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'Month'
+                        }
+                    }],
+                    yAxes: [{
+                        display: true,
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'Value'
+                        },
+                    }]
+                }
+            }
+        };
+
+        $.each(config.data.datasets, function(i, dataset) {
+            dataset.borderColor = randomColor(0.4);
+            dataset.backgroundColor = randomColor(0.5);
+            dataset.pointBorderColor = randomColor(0.7);
+            dataset.pointBackgroundColor = randomColor(0.5);
+            dataset.pointBorderWidth = 1;
+        });
+
+        console.log(config.data);
+
+        window.onload = function() {
+            var ctx = document.getElementById("canvas").getContext("2d");
+            window.myLine = new Chart(ctx, config);
+
+            updateLegend();
+        };
+
+        function updateLegend() {
+            $legendContainer = $('#legendContainer');
+            $legendContainer.empty();
+            $legendContainer.append(window.myLine.generateLegend());
+        }
+
+        $('#randomizeData').click(function() {
+            $.each(config.data.datasets, function(i, dataset) {
+                dataset.data = dataset.data.map(function() {
+                    return randomScalingFactor();
+                });
+
+            });
+
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#addDataset').click(function() {
+            var newDataset = {
+                label: 'Dataset ' + config.data.datasets.length,
+                borderColor: randomColor(0.4),
+                backgroundColor: randomColor(0.5),
+                pointBorderColor: randomColor(0.7),
+                pointBackgroundColor: randomColor(0.5),
+                pointBorderWidth: 1,
+                data: [],
+            };
+
+            for (var index = 0; index < config.data.labels.length; ++index) {
+                newDataset.data.push(randomScalingFactor());
+            }
+
+            config.data.datasets.push(newDataset);
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#addData').click(function() {
+            if (config.data.datasets.length > 0) {
+                config.data.labels.push('dataset #' + config.data.labels.length);
+
+                $.each(config.data.datasets, function(i, dataset) {
+                    dataset.data.push(randomScalingFactor());
+                });
+
+                window.myLine.update();
+                updateLegend();
+            }
+        });
+
+        $('#removeDataset').click(function() {
+            config.data.datasets.splice(0, 1);
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#removeData').click(function() {
+            config.data.labels.splice(-1, 1); // remove the label first
+
+            config.data.datasets.forEach(function(dataset, datasetIndex) {
+                dataset.data.pop();
+            });
+
+            window.myLine.update();
+            updateLegend();
+        });
+    </script>
+</body>
+
+</html>

samples/line-stacked-area.html

@@ -0,0 +1,174 @@
+<!doctype html>
+<html>
+
+<head>
+  <title>Line Chart</title>
+  <script src="../Chart.js"></script>
+  <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+  <style>
+    canvas {
+      -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
+    }
+  </style>
+</head>
+
+<body>
+  <div style="width:100%;">
+    <canvas id="canvas" style="width:100%;height:100%"></canvas>
+  </div>
+  <br>
+  <br>
+  <button id="randomizeData">Randomize Data</button>
+  <button id="addDataset">Add Dataset</button>
+  <button id="removeDataset">Remove Dataset</button>
+  <button id="addData">Add Data</button>
+  <button id="removeData">Remove Data</button>
+  <div>
+    <h3>Legend</h3>
+    <div id="legendContainer">
+    </div>
+  </div>
+  <script>
+    var randomScalingFactor = function() {
+      return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
+    };
+    var randomColorFactor = function() {
+      return Math.round(Math.random() * 255);
+    };
+    var randomColor = function(opacity) {
+      return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '1') + ')';
+    };
+
+    var config = {
+      type: 'line',
+      data: {
+        labels: ["January", "February", "March", "April", "May", "June", "July"],
+        datasets: [{
+          label: "My First dataset",
+          data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+        }, {
+          label: "My Second dataset",
+          data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+        }, {
+          label: "My Third dataset",
+          data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+        }, {
+          label: "My Third dataset",
+          data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+        }]
+      },
+      options: {
+        responsive: true,
+        tooltips: {
+          mode: 'label',
+        },
+        hover: {
+          mode: 'label'
+        },
+        scales: {
+          xAxes: [{
+            scaleLabel: {
+              display: true,
+              labelString: 'Month'
+            }
+          }],
+          yAxes: [{
+            stacked: true,
+            scaleLabel: {
+              display: true,
+              labelString: 'Value'
+            }
+          }]
+        }
+      }
+    };
+
+    $.each(config.data.datasets, function(i, dataset) {
+      var color = randomColor(1);
+      dataset.borderColor = color;
+      dataset.backgroundColor = color;
+      dataset.pointBorderColor = color;
+      dataset.pointBackgroundColor = color;
+      dataset.pointBorderWidth = 1;
+    });
+
+    console.log(config.data);
+
+    window.onload = function() {
+      var ctx = document.getElementById("canvas").getContext("2d");
+      window.myLine = new Chart(ctx, config);
+
+      updateLegend();
+    };
+
+    function updateLegend() {
+      $legendContainer = $('#legendContainer');
+      $legendContainer.empty();
+      $legendContainer.append(window.myLine.generateLegend());
+    }
+
+    $('#randomizeData').click(function() {
+      $.each(config.data.datasets, function(i, dataset) {
+        dataset.data = dataset.data.map(function() {
+          return randomScalingFactor();
+        });
+
+      });
+
+      window.myLine.update();
+      updateLegend();
+    });
+
+    $('#addDataset').click(function() {
+      var newDataset = {
+        label: 'Dataset ' + config.data.datasets.length,
+        borderColor: randomColor(0.4),
+        backgroundColor: randomColor(0.5),
+        pointBorderColor: randomColor(0.7),
+        pointBackgroundColor: randomColor(0.5),
+        pointBorderWidth: 1,
+        data: [],
+      };
+
+      for (var index = 0; index < config.data.labels.length; ++index) {
+        newDataset.data.push(randomScalingFactor());
+      }
+
+      config.data.datasets.push(newDataset);
+      window.myLine.update();
+      updateLegend();
+    });
+
+    $('#addData').click(function() {
+      if (config.data.datasets.length > 0) {
+        config.data.labels.push('dataset #' + config.data.labels.length);
+
+        $.each(config.data.datasets, function(i, dataset) {
+          dataset.data.push(randomScalingFactor());
+        });
+
+        window.myLine.update();
+        updateLegend();
+      }
+    });
+
+    $('#removeDataset').click(function() {
+      config.data.datasets.splice(0, 1);
+      window.myLine.update();
+      updateLegend();
+    });
+
+    $('#removeData').click(function() {
+      config.data.labels.splice(-1, 1); // remove the label first
+
+      config.data.datasets.forEach(function(dataset, datasetIndex) {
+        dataset.data.pop();
+      });
+
+      window.myLine.update();
+      updateLegend();
+    });
+  </script>
+</body>
+
+</html>

samples/line-time-point-data.html

@@ -0,0 +1,164 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>Time Scale Point Data</title>
+    <script src="../node_modules/moment/min/moment.min.js"></script>
+    <script src="../Chart.js"></script>
+    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+    <style>
+        canvas {
+            -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
+        }
+    </style>
+</head>
+
+<body>
+    <div style="width:100%;">
+        <canvas id="canvas" style="width:100%;height:100%"></canvas>
+    </div>
+    <br>
+    <br>
+    <button id="randomizeData">Randomize Data</button>
+    <button id="addData">Add Data</button>
+    <button id="removeData">Remove Data</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+        </div>
+    </div>
+    <script>
+        var randomScalingFactor = function() {
+            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
+        };
+        var randomColorFactor = function() {
+            return Math.round(Math.random() * 255);
+        };
+        var randomColor = function(opacity) {
+            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '.3') + ')';
+        };
+        var newDate = function(days) {
+            var date = new Date();
+            return date.setDate(date.getDate() + days);
+        };
+        var newTimestamp = function(days) {
+            return Date.now() - days * 100000;
+        };
+
+        var config = {
+            type: 'line',
+            data: {
+                datasets: [{
+                    label: "Dataset with point data",
+                    data: [{
+                        x: "12/31/2014 06:00",
+                        y: randomScalingFactor()
+                    }, {
+                        x: "01/04/2015 13:00",
+                        y: randomScalingFactor()
+                    }, {
+                        x: "01/07/2015 01:15",
+                        y: randomScalingFactor()
+                    }, {
+                        x: "01/15/2015 01:15",
+                        y: randomScalingFactor()
+                    }],
+                    fill: false
+                }]
+            },
+            options: {
+                responsive: true,
+                scales: {
+                    xAxes: [{
+                        type: "time",
+                        display: true,
+                        time: {
+                            format: 'MM/DD/YYYY HH:mm',
+                            // round: 'day'
+                        },
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'Date'
+                        }
+                    }, ],
+                    yAxes: [{
+                        display: true,
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'value'
+                        }
+                    }]
+                },
+                elements: {
+                    line: {
+                        tension: 0.3
+                    }
+                },
+            }
+        };
+
+        $.each(config.data.datasets, function(i, dataset) {
+            dataset.borderColor = randomColor(0.4);
+            dataset.backgroundColor = randomColor(0.5);
+            dataset.pointBorderColor = randomColor(0.7);
+            dataset.pointBackgroundColor = randomColor(0.5);
+            dataset.pointBorderWidth = 1;
+        });
+
+        console.log(config.data);
+
+        window.onload = function() {
+            var ctx = document.getElementById("canvas").getContext("2d");
+            window.myLine = new Chart(ctx, config);
+
+            updateLegend();
+        };
+
+        function updateLegend() {
+            $legendContainer = $('#legendContainer');
+            $legendContainer.empty();
+            $legendContainer.append(window.myLine.generateLegend());
+        }
+
+        $('#randomizeData').click(function() {
+            $.each(config.data.datasets, function(i, dataset) {
+                dataset.data = dataset.data.map(function() {
+                    return randomScalingFactor();
+                });
+            });
+
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#addData').click(function() {
+            if (config.data.datasets.length > 0) {
+                var newTime = myLine.scales['x-axis-0'].labelMoments[0][myLine.scales['x-axis-0'].labelMoments[0].length - 1]
+                    .clone()
+                    .add(1, 'day')
+                    .format('MM/DD/YYYY HH:mm');
+
+                for (var index = 0; index < config.data.datasets.length; ++index) {
+                    config.data.datasets[index].data.push({
+                        x: newTime,
+                        y: randomScalingFactor()
+                    });
+                }
+
+                window.myLine.update();
+                updateLegend();
+            }
+        });
+
+        $('#removeData').click(function() {
+            config.data.datasets.forEach(function(dataset, datasetIndex) {
+                dataset.data.pop();
+            });
+
+            window.myLine.update();
+            updateLegend();
+        });
+    </script>
+</body>
+
+</html>

samples/line-time-scale.html

@@ -63,6 +63,22 @@
                 }, {
                     label: "My Second dataset",
                     data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                }, {
+                    label: "Dataset with point data",
+                    data: [{
+                        x: "12/31/2014 06:00",
+                        y: randomScalingFactor()
+                    }, {
+                        x: "01/04/2015 13:00",
+                        y: randomScalingFactor()
+                    }, {
+                        x: "01/07/2015 01:15",
+                        y: randomScalingFactor()
+                    }, {
+                        x: "01/15/2015 01:15",
+                        y: randomScalingFactor()
+                    }],
+                    fill: false
                 }]
             },
             options: {
@@ -76,14 +92,14 @@
                             // round: 'day'
                         },
                         scaleLabel: {
-                            show: true,
+                            display: true,
                             labelString: 'Date'
                         }
                     }, ],
                     yAxes: [{
                         display: true,
                         scaleLabel: {
-                            show: true,
+                            display: true,
                             labelString: 'value'
                         }
                     }]

samples/line-x-axis-filter.html

@@ -54,8 +54,8 @@
                     xAxes: [{
                         display: true,
                         ticks: {
-                            callback: function(dataLabel, index) {
-                                return dataLabel;
+                            userCallback: function(dataLabel, index) {
+                                return index % 2 === 0 ? dataLabel : '';
                             }
                         }
                     }],

samples/line.html

@@ -13,12 +13,13 @@
 </head>
 
 <body>
-    <div style="width:50%;">
+    <div style="width:100%;">
         <canvas id="canvas" style="width:100%;height:100%"></canvas>
     </div>
     <br>
     <br>
     <button id="randomizeData">Randomize Data</button>
+    <button id="changeDataObject">Change Data Object</button>
     <button id="addDataset">Add Dataset</button>
     <button id="removeDataset">Remove Dataset</button>
     <button id="addData">Add Data</button>
@@ -30,7 +31,8 @@
     </div>
     <script>
         var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
+            return Math.round(Math.random() * 100);
+            //return 0;
         };
         var randomColorFactor = function() {
             return Math.round(Math.random() * 255);
@@ -48,6 +50,10 @@
                     data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
                     fill: false,
                     borderDash: [5, 5],
+                }, {
+                    hidden: true,
+                    label: 'hidden dataset',
+                    data: [],
                 }, {
                     label: "My Second dataset",
                     data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
@@ -55,6 +61,35 @@
             },
             options: {
                 responsive: true,
+                tooltips: {
+                    mode: 'label',
+                    callbacks: {
+                        // beforeTitle: function() {
+                        //     return '...beforeTitle';
+                        // },
+                        // afterTitle: function() {
+                        //     return '...afterTitle';
+                        // },
+                        // beforeBody: function() {
+                        //     return '...beforeBody';
+                        // },
+                        // afterBody: function() {
+                        //     return '...afterBody';
+                        // },
+                        // beforeFooter: function() {
+                        //     return '...beforeFooter';
+                        // },
+                        // footer: function() {
+                        //     return 'Footer';
+                        // },
+                        // afterFooter: function() {
+                        //     return '...afterFooter';
+                        // },
+                    }
+                },
+                hover: {
+                    mode: 'label'
+                },
                 scales: {
                     xAxes: [{
                         display: true,
@@ -68,6 +103,10 @@
                         scaleLabel: {
                             show: true,
                             labelString: 'Value'
+                        },
+                        ticks: {
+                            suggestedMin: -10,
+                            suggestedMax: 250,
                         }
                     }]
                 }
@@ -109,6 +148,32 @@
             updateLegend();
         });
 
+        $('#changeDataObject').click(function() {
+            config.data = {
+                labels: ["July", "August", "September", "October", "November", "December"],
+                datasets: [{
+                    label: "My First dataset",
+                    data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                    fill: false,
+                }, {
+                    label: "My Second dataset",
+                    fill: false,
+                    data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                }]
+            };
+
+            $.each(config.data.datasets, function(i, dataset) {
+                dataset.borderColor = randomColor(0.4);
+                dataset.backgroundColor = randomColor(0.5);
+                dataset.pointBorderColor = randomColor(0.7);
+                dataset.pointBackgroundColor = randomColor(0.5);
+                dataset.pointBorderWidth = 1;
+            });
+
+            // Update the chart
+            window.myLine.update();
+        });
+
         $('#addDataset').click(function() {
             var newDataset = {
                 label: 'Dataset ' + config.data.datasets.length,

samples/polar-area.html

@@ -8,7 +8,7 @@
 </head>
 
 <body>
-    <div id="canvas-holder" style="width:50%" width="50%">
+    <div id="canvas-holder" style="width:100%">
         <canvas id="chart-area"></canvas>
     </div>
     <button id="randomizeData">Randomize Data</button>
@@ -17,7 +17,7 @@
     <div>
         <h3>Legend</h3>
         <div id="legendContainer">
-            
+
         </div>
     </div>
     <script>
@@ -60,9 +60,12 @@
         options: {
             responsive: true,
             scale: {
-                beginAtZero: true,
-                reverse: false
-            }
+              ticks: {
+                beginAtZero: true
+              },
+              reverse: false
+            },
+            animateRotate:false
         }
     };
 

samples/radar-skip-points.html

@@ -0,0 +1,152 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>Radar Chart</title>
+    <script src="../Chart.js"></script>
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+</head>
+
+<body>
+    <div style="width:50%">
+        <canvas id="canvas" height="450" width="450"></canvas>
+    </div>
+    <button id="randomizeData">Randomize Data</button>
+    <button id="addDataset">Add Dataset</button>
+    <button id="removeDataset">Remove Dataset</button>
+    <button id="addData">Add Data</button>
+    <button id="removeData">Remove Data</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+            
+        </div>
+    </div>
+    <script>
+    var randomScalingFactor = function() {
+        return Math.round(Math.random() * 100);
+    };
+    var randomColorFactor = function() {
+        return Math.round(Math.random() * 255);
+    };
+    var randomColor = function(opacity) {
+        return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '.3') + ')';
+    };
+
+    var config = {
+        type: 'radar',
+        data: {
+            labels: ["Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running"],
+            datasets: [{
+                label: "Skip first dataset",
+                borderColor: 'rgb(255, 0, 0)',
+                backgroundColor: "rgba(255,255,0,0.5)",
+                pointBackgroundColor: "rgba(220,220,220,1)",
+                data: [NaN, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+            }, {
+                label: "Skip mid dataset",
+                borderColor: 'rgb(255, 0, 255)',
+                backgroundColor: "rgba(0, 255, 0, 0.5)",
+                pointBackgroundColor: "rgba(151,187,205,1)",
+                hoverPointBackgroundColor: "#fff",
+                pointHighlightStroke: "rgba(151,187,205,1)",
+                data: [randomScalingFactor(), randomScalingFactor(), NaN, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+            },{
+                label: "Skip last dataset",
+                borderColor: 'rgb(0, 255, 255)',
+                backgroundColor: "rgba(0, 0, 255, 0.5)",
+                pointBackgroundColor: "rgba(151,187,205,1)",
+                hoverPointBackgroundColor: "#fff",
+                pointHighlightStroke: "rgba(151,187,205,1)",
+                data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), NaN]
+            }]
+        },
+        options: {
+            elements: {
+                line: {
+                    tension: 0.0,
+                }
+            },
+            scale: {
+                beginAtZero: true,
+                reverse: false
+            }
+        }
+    };
+
+    function updateLegend() {
+        $legendContainer = $('#legendContainer');
+        $legendContainer.empty();
+        $legendContainer.append(window.myRadar.generateLegend());
+    }
+
+    window.onload = function() {
+        window.myRadar = new Chart(document.getElementById("canvas"), config);
+        updateLegend();
+    };
+
+    $('#randomizeData').click(function() {
+        $.each(config.data.datasets, function(i, dataset) {
+            dataset.data = dataset.data.map(function() {
+                return randomScalingFactor();
+            });
+
+        });
+
+        window.myRadar.update();
+        updateLegend();
+    });
+
+    $('#addDataset').click(function() {
+        var newDataset = {
+            label: 'Dataset ' + config.data.datasets.length,
+            borderColor: randomColor(0.4),
+            backgroundColor: randomColor(0.5),
+            pointBorderColor: randomColor(0.7),
+            pointBackgroundColor: randomColor(0.5),
+            pointBorderWidth: 1,
+            data: [],
+        };
+
+        for (var index = 0; index < config.data.labels.length; ++index) {
+            newDataset.data.push(randomScalingFactor());
+        }
+
+        config.data.datasets.push(newDataset);
+        window.myRadar.update();
+        updateLegend();
+    });
+
+    $('#addData').click(function() {
+        if (config.data.datasets.length > 0) {
+            config.data.labels.push('dataset #' + config.data.labels.length);
+
+            $.each(config.data.datasets, function (i, dataset) {
+                dataset.data.push(randomScalingFactor());
+            });
+
+            window.myRadar.update();
+            updateLegend();
+        }
+    });
+
+    $('#removeDataset').click(function() {
+        config.data.datasets.splice(0, 1);
+        window.myRadar.update();
+        updateLegend();
+    });
+
+    $('#removeData').click(function() {
+        config.data.labels.pop(); // remove the label first
+
+        $.each(config.data.datasets, function(i, dataset) {
+            dataset.data.pop();
+        });
+
+        window.myRadar.update();
+        updateLegend();
+    });
+    </script>
+</body>
+
+</html>

samples/radar.html

@@ -8,8 +8,8 @@
 </head>
 
 <body>
-    <div style="width:50%">
-        <canvas id="canvas" height="450" width="450"></canvas>
+    <div style="width:100%">
+        <canvas id="canvas"></canvas>
     </div>
     <button id="randomizeData">Randomize Data</button>
     <button id="addDataset">Add Dataset</button>
@@ -19,7 +19,7 @@
     <div>
         <h3>Legend</h3>
         <div id="legendContainer">
-            
+
         </div>
     </div>
     <script>
@@ -41,20 +41,26 @@
                 label: "My First dataset",
                 backgroundColor: "rgba(220,220,220,0.2)",
                 pointBackgroundColor: "rgba(220,220,220,1)",
-                data: [null, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+                data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+            }, {
+                label: 'Hidden dataset',
+                hidden: true,
+                data: [],
             }, {
                 label: "My Second dataset",
                 backgroundColor: "rgba(151,187,205,0.2)",
                 pointBackgroundColor: "rgba(151,187,205,1)",
                 hoverPointBackgroundColor: "#fff",
                 pointHighlightStroke: "rgba(151,187,205,1)",
-                data: [null, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
-            }]
+                data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()]
+            },]
         },
         options: {
             scale: {
-                beginAtZero: true,
-                reverse: false
+              reverse: true,
+              ticks: {
+                beginAtZero: true
+              }
             }
         }
     };

samples/scatter-logX.html

@@ -149,7 +149,7 @@
 	            		},
 	            		scaleLabel: {
 	            			labelString: 'Frequency',
-	            			show: true,
+	            			display: true,
 	            		}
 	            	}],
 	            	yAxes: [{
@@ -161,7 +161,7 @@
 	            		},
 	            		scaleLabel: {
 	            			labelString: 'Voltage',
-	            			show: true
+	            			display: true
 	            		}
 	            	}]
 	            }

samples/scatter.html

@@ -96,7 +96,7 @@
                                 zeroLineColor: "rgba(0,255,0,1)"
                             },
                             scaleLabel: {
-                                show: true,
+                                display: true,
                                 labelString: 'x axis'
                             }
                         }],
@@ -106,7 +106,7 @@
                                 zeroLineColor: "rgba(0,255,0,1)"
                             },
                             scaleLabel: {
-                                show: true,
+                                display: true,
                                 labelString: 'y axis'
                             }
                         }]

samples/tooltip-hooks.html

@@ -0,0 +1,191 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>Line Chart</title>
+    <script src="../Chart.js"></script>
+    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+    <style>
+        canvas {
+            -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
+        }
+    </style>
+</head>
+
+<body>
+    <div style="width:100%;">
+        <canvas id="canvas" style="width:100%;height:100%"></canvas>
+    </div>
+    <br>
+    <br>
+    <button id="randomizeData">Randomize Data</button>
+    <button id="addDataset">Add Dataset</button>
+    <button id="removeDataset">Remove Dataset</button>
+    <button id="addData">Add Data</button>
+    <button id="removeData">Remove Data</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+        </div>
+    </div>
+    <script>
+        var randomScalingFactor = function() {
+            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
+        };
+        var randomColorFactor = function() {
+            return Math.round(Math.random() * 255);
+        };
+        var randomColor = function(opacity) {
+            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '.3') + ')';
+        };
+
+        var config = {
+            type: 'line',
+            data: {
+                labels: ["January", "February", "March", "April", "May", "June", "July"],
+                datasets: [{
+                    label: "My First dataset",
+                    data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                    fill: false,
+                    borderDash: [5, 5],
+                }, {
+                    label: "My Second dataset",
+                    data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                }]
+            },
+            options: {
+                responsive: true,
+                tooltips: {
+                    mode: 'label',
+                    callbacks: {
+                        beforeTitle: function() {
+                            return '...beforeTitle';
+                        },
+                        afterTitle: function() {
+                            return '...afterTitle';
+                        },
+                        beforeBody: function() {
+                            return '...beforeBody';
+                        },
+                        afterBody: function() {
+                            return '...afterBody';
+                        },
+                        beforeFooter: function() {
+                            return '...beforeFooter';
+                        },
+                        footer: function() {
+                            return 'Footer';
+                        },
+                        afterFooter: function() {
+                            return '...afterFooter';
+                        },
+                    }
+                },
+                hover: {
+                    mode: 'label'
+                },
+                scales: {
+                    xAxes: [{
+                        display: true,
+                        scaleLabel: {
+                            show: true,
+                            labelString: 'Month'
+                        }
+                    }],
+                    yAxes: [{
+                        display: true,
+                        scaleLabel: {
+                            show: true,
+                            labelString: 'Value'
+                        }
+                    }]
+                }
+            }
+        };
+
+        $.each(config.data.datasets, function(i, dataset) {
+            dataset.borderColor = randomColor(0.4);
+            dataset.backgroundColor = randomColor(0.5);
+            dataset.pointBorderColor = randomColor(0.7);
+            dataset.pointBackgroundColor = randomColor(0.5);
+            dataset.pointBorderWidth = 1;
+        });
+
+        window.onload = function() {
+            var ctx = document.getElementById("canvas").getContext("2d");
+            window.myLine = new Chart(ctx, config);
+
+            updateLegend();
+        };
+
+        function updateLegend() {
+            $legendContainer = $('#legendContainer');
+            $legendContainer.empty();
+            $legendContainer.append(window.myLine.generateLegend());
+        }
+
+        $('#randomizeData').click(function() {
+            $.each(config.data.datasets, function(i, dataset) {
+                dataset.data = dataset.data.map(function() {
+                    return randomScalingFactor();
+                });
+
+            });
+
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#addDataset').click(function() {
+            var newDataset = {
+                label: 'Dataset ' + config.data.datasets.length,
+                borderColor: randomColor(0.4),
+                backgroundColor: randomColor(0.5),
+                pointBorderColor: randomColor(0.7),
+                pointBackgroundColor: randomColor(0.5),
+                pointBorderWidth: 1,
+                data: [],
+            };
+
+            for (var index = 0; index < config.data.labels.length; ++index) {
+                newDataset.data.push(randomScalingFactor());
+            }
+
+            config.data.datasets.push(newDataset);
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#addData').click(function() {
+            if (config.data.datasets.length > 0) {
+                config.data.labels.push('dataset #' + config.data.labels.length);
+
+                $.each(config.data.datasets, function(i, dataset) {
+                    dataset.data.push(randomScalingFactor());
+                });
+
+                window.myLine.update();
+                updateLegend();
+            }
+        });
+
+        $('#removeDataset').click(function() {
+            config.data.datasets.splice(0, 1);
+            window.myLine.update();
+            updateLegend();
+        });
+
+        $('#removeData').click(function() {
+            config.data.labels.splice(-1, 1); // remove the label first
+
+            config.data.datasets.forEach(function(dataset, datasetIndex) {
+                dataset.data.pop();
+            });
+
+            window.myLine.update();
+            updateLegend();
+        });
+    </script>
+</body>
+
+</html>

src/charts/Chart.Bubble.js

@@ -0,0 +1,48 @@
+(function() {
+	"use strict";
+
+	var root = this;
+	var Chart = root.Chart;
+	var helpers = Chart.helpers;
+
+	var defaultConfig = {
+		hover: {
+			mode: 'single',
+		},
+
+		scales: {
+			xAxes: [{
+				type: "linear", // bubble should probably use a linear scale by default
+				position: "bottom",
+				id: "x-axis-0", // need an ID so datasets can reference the scale
+			}],
+			yAxes: [{
+				type: "linear",
+				position: "left",
+				id: "y-axis-0",
+			}],
+		},
+
+		tooltips: {
+			callbacks: {
+				title: function(tooltipItems, data) {
+					// Title doesn't make sense for scatter since we format the data as a point
+					return '';
+				},
+				label: function(tooltipItem, data) {
+					return '(' + tooltipItem.xLabel + ', ' + tooltipItem.yLabel + ')';
+				}
+			}
+		},
+
+	};
+
+	// Register the default config for this type
+	Chart.defaults.bubble = defaultConfig;
+
+	Chart.Bubble = function(context, config) {
+		config.type = 'bubble';
+		return new Chart(context, config);
+	};
+
+}).call(this);

src/charts/Chart.Doughnut.js

@@ -7,7 +7,23 @@
 
 	var defaultConfig = {
 		aspectRatio: 1,
-		legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets[0].data.length; i++){%><li><span style=\"background-color:<%=data.datasets[0].backgroundColor[i]%>\"><%if(data.labels && i < data.labels.length){%><%=data.labels[i]%><%}%></span></li><%}%></ul>",
+		legendCallback: function(chart) {
+			var text = [];
+			text.push('<ul class="' + chart.id + '-legend">');
+
+			if (chart.data.datasets.length) {
+				for (var i = 0; i < chart.data.datasets[0].data.length; ++i) {
+					text.push('<li><span style="background-color:' + chart.data.datasets[0].backgroundColor[i] + '">');
+					if (chart.data.labels[i]) {
+						text.push(chart.data.labels[i]);
+					}
+					text.push('</span></li>');
+				}
+			}
+
+			text.push('</ul>');
+			return text.join("");
+		}
 	};
 
 	Chart.Doughnut = function(context, config) {
@@ -15,6 +31,6 @@
 		config.type = 'doughnut';
 
 		return new Chart(context, config);
-	}
+	};
 	
 }).call(this);

src/charts/Chart.Line.js

@@ -9,6 +9,6 @@
 		config.type = 'line';
 
 		return new Chart(context, config);
-	}
+	};
 	
 }).call(this);

src/charts/Chart.PolarArea.js

@@ -7,7 +7,23 @@
 
 	var defaultConfig = {
 		aspectRatio: 1,
-		legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets[0].data.length; i++){%><li><span style=\"background-color:<%=data.datasets[0].backgroundColor[i]%>\"><%if(data.labels && i < data.labels.length){%><%=data.labels[i]%><%}%></span></li><%}%></ul>",
+		legendCallback: function(chart) {
+			var text = [];
+			text.push('<ul class="' + chart.id + '-legend">');
+
+			if (chart.data.datasets.length) {
+				for (var i = 0; i < chart.data.datasets[0].data.length; ++i) {
+					text.push('<li><span style="background-color:' + chart.data.datasets[0].backgroundColor[i] + '">');
+					if (chart.data.labels[i]) {
+						text.push(chart.data.labels[i]);
+					}
+					text.push('</span></li>');
+				}
+			}
+
+			text.push('</ul>');
+			return text.join("");
+		}
 	};
 
 	Chart.PolarArea = function(context, config) {
@@ -15,6 +31,6 @@
 		config.type = 'polarArea';
 
 		return new Chart(context, config);
-	}
+	};
 	
 }).call(this);

src/charts/Chart.Radar.js

@@ -14,6 +14,6 @@
 		config.type = 'radar';
 
 		return new Chart(context, config);
-	}
+	};
 	
 }).call(this);

src/charts/Chart.Scatter.js

@@ -24,16 +24,27 @@
 		},
 
 		tooltips: {
-			template: "(<%= value.x %>, <%= value.y %>)",
-			multiTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)",
+			callbacks: {
+				title: function(tooltipItems, data) {
+					// Title doesn't make sense for scatter since we format the data as a point
+					return '';
+				},
+				label: function(tooltipItem, data) {
+					return '(' + tooltipItem.xLabel + ', ' + tooltipItem.yLabel + ')';
+				}
+			}
 		},
-
 	};
 
+	// Register the default config for this type
+	Chart.defaults.scatter = defaultConfig;
+
+	// Scatter charts use line controllers
+	Chart.controllers.scatter = Chart.controllers.line;
+
 	Chart.Scatter = function(context, config) {
-		config.options = helpers.configMerge(defaultConfig, config.options);
-		config.type = 'line';
+		config.type = 'scatter';
 		return new Chart(context, config);
-	}
+	};
 	
 }).call(this);

src/controllers/controller.bar.js

@@ -66,15 +66,15 @@
 		// Get the number of datasets that display bars. We use this to correctly calculate the bar width
 		getBarCount: function getBarCount() {
 			var barCount = 0;
-
 			helpers.each(this.chart.data.datasets, function(dataset) {
-				if (dataset.type === 'bar') {
-					++barCount;
-				} else if (dataset.type === undefined && this.chart.config.type === 'bar') {
-					++barCount;
+				if (helpers.isDatasetVisible(dataset)) {
+					if (dataset.type === 'bar') {
+						++barCount;
+					} else if (dataset.type === undefined && this.chart.config.type === 'bar') {
+						++barCount;
+					}
 				}
 			}, this);
-
 			return barCount;
 		},
 
@@ -192,14 +192,16 @@
 
 				if (value < 0) {
 					for (var i = 0; i < datasetIndex; i++) {
-						if (this.chart.data.datasets[i].yAxisID === yScale.id) {
-							base += this.chart.data.datasets[i].data[index] < 0 ? this.chart.data.datasets[i].data[index] : 0;
+						var negDS = this.chart.data.datasets[i];
+						if (helpers.isDatasetVisible(negDS) && negDS.yAxisID === yScale.id) {
+							base += negDS.data[index] < 0 ? negDS.data[index] : 0;
 						}
 					}
 				} else {
 					for (var j = 0; j < datasetIndex; j++) {
-						if (this.chart.data.datasets[j].yAxisID === yScale.id) {
-							base += this.chart.data.datasets[j].data[index] > 0 ? this.chart.data.datasets[j].data[index] : 0;
+						var posDS = this.chart.data.datasets[j];
+						if (helpers.isDatasetVisible(posDS) && posDS.yAxisID === yScale.id) {
+							base += posDS.data[index] > 0 ? posDS.data[index] : 0;
 						}
 					}
 				}
@@ -225,10 +227,11 @@
 
 			var xScale = this.getScaleForID(this.getDataset().xAxisID);
 			var yScale = this.getScaleForID(this.getDataset().yAxisID);
-
-			var datasetCount = !this.chart.isCombo ? this.chart.data.datasets.length : helpers.where(this.chart.data.datasets, function(ds) {
+			/*var datasetCount = !this.chart.isCombo ? this.chart.data.datasets.length : helpers.where(this.chart.data.datasets, function(ds) {
 				return ds.type == 'bar';
-			}).length;
+			}).length;*/
+			var datasetCount = this.getBarCount();
+
 			var tickWidth = (function() {
 				var min = xScale.getPixelForValue(null, 1) - xScale.getPixelForValue(null, 0);
 				for (var i = 2; i < this.getDataset().data.length; i++) {
@@ -266,26 +269,40 @@
 
 		},
 
+		// Get bar index from the given dataset index accounting for the fact that not all bars are visible
+		getBarIndex: function(datasetIndex) {
+			var barIndex = 0;
+
+			for (var j = 0; j < datasetIndex; ++j) {
+				if (helpers.isDatasetVisible(this.chart.data.datasets[j]) &&
+					(this.chart.data.datasets[j].type === 'bar' || (this.chart.data.datasets[j].type === undefined && this.chart.config.type === 'bar'))) {
+					++barIndex;
+				}
+			}
+
+			return barIndex;
+		},
 
 		calculateBarX: function(index, datasetIndex) {
 
 			var yScale = this.getScaleForID(this.getDataset().yAxisID);
 			var xScale = this.getScaleForID(this.getDataset().xAxisID);
+			var barIndex = this.getBarIndex(datasetIndex);
 
 			var ruler = this.getRuler();
-			var leftTick = xScale.getPixelForValue(null, index, datasetIndex, this.chart.isCombo);
+			var leftTick = xScale.getPixelForValue(null, index, barIndex, this.chart.isCombo);
 			leftTick -= this.chart.isCombo ? (ruler.tickWidth / 2) : 0;
 
-			if (yScale.options.stacked) {
+			if (xScale.options.stacked) {
 				return leftTick + (ruler.categoryWidth / 2) + ruler.categorySpacing;
 			}
 
 			return leftTick +
 				(ruler.barWidth / 2) +
 				ruler.categorySpacing +
-				(ruler.barWidth * datasetIndex) +
+				(ruler.barWidth * barIndex) +
 				(ruler.barSpacing / 2) +
-				(ruler.barSpacing * datasetIndex);
+				(ruler.barSpacing * barIndex);
 		},
 
 		calculateBarY: function(index, datasetIndex) {
@@ -301,10 +318,13 @@
 					sumNeg = 0;
 
 				for (var i = 0; i < datasetIndex; i++) {
-					if (this.chart.data.datasets[i].data[index] < 0) {
-						sumNeg += this.chart.data.datasets[i].data[index] || 0;
-					} else {
-						sumPos += this.chart.data.datasets[i].data[index] || 0;
+					var ds = this.chart.data.datasets[i];
+					if (helpers.isDatasetVisible(ds)) {
+						if (ds.data[index] < 0) {
+							sumNeg += ds.data[index] || 0;
+						} else {
+							sumPos += ds.data[index] || 0;
+						}
 					}
 				}
 

src/controllers/controller.bubble.js

@@ -0,0 +1,219 @@
+(function() {
+
+	"use strict";
+
+	var root = this,
+		Chart = root.Chart,
+		helpers = Chart.helpers;
+
+	Chart.defaults.bubble = {
+		hover: {
+			mode: "single"
+		},
+
+		scales: {
+			xAxes: [{
+				type: "linear", // bubble should probably use a linear scale by default
+				position: "bottom",
+				id: "x-axis-0", // need an ID so datasets can reference the scale
+			}],
+			yAxes: [{
+				type: "linear",
+				position: "left",
+				id: "y-axis-0",
+			}],
+		},
+
+		tooltips: {
+			template: "(<%= value.x %>, <%= value.y %>, <%= value.r %>)",
+			multiTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>, <%= value.r %>)",
+		},
+	};
+
+
+	Chart.controllers.bubble = function(chart, datasetIndex) {
+		this.initialize.call(this, chart, datasetIndex);
+	};
+
+	helpers.extend(Chart.controllers.bubble.prototype, {
+
+		initialize: function(chart, datasetIndex) {
+			this.chart = chart;
+			this.index = datasetIndex;
+			this.linkScales();
+			this.addElements();
+		},
+		updateIndex: function(datasetIndex) {
+			this.index = datasetIndex;
+		},
+
+		linkScales: function() {
+			if (!this.getDataset().xAxisID) {
+				this.getDataset().xAxisID = this.chart.options.scales.xAxes[0].id;
+			}
+
+			if (!this.getDataset().yAxisID) {
+				this.getDataset().yAxisID = this.chart.options.scales.yAxes[0].id;
+			}
+		},
+
+		getDataset: function() {
+			return this.chart.data.datasets[this.index];
+		},
+
+		getScaleForId: function(scaleID) {
+			return this.chart.scales[scaleID];
+		},
+
+		addElements: function() {
+
+			this.getDataset().metaData = this.getDataset().metaData || [];
+
+			helpers.each(this.getDataset().data, function(value, index) {
+				this.getDataset().metaData[index] = this.getDataset().metaData[index] || new Chart.elements.Point({
+					_chart: this.chart.chart,
+					_datasetIndex: this.index,
+					_index: index,
+				});
+			}, this);
+		},
+		addElementAndReset: function(index) {
+			this.getDataset().metaData = this.getDataset().metaData || [];
+			var point = new Chart.elements.Point({
+				_chart: this.chart.chart,
+				_datasetIndex: this.index,
+				_index: index,
+			});
+
+			// Reset the point
+			this.updateElement(point, index, true);
+
+			// Add to the points array
+			this.getDataset().metaData.splice(index, 0, point);
+
+		},
+		removeElement: function(index) {
+			this.getDataset().metaData.splice(index, 1);
+		},
+
+		reset: function() {
+			this.update(true);
+		},
+
+		buildOrUpdateElements: function buildOrUpdateElements() {
+			// Handle the number of data points changing
+			var numData = this.getDataset().data.length;
+			var numPoints = this.getDataset().metaData.length;
+
+			// Make sure that we handle number of datapoints changing
+			if (numData < numPoints) {
+				// Remove excess bars for data points that have been removed
+				this.getDataset().metaData.splice(numData, numPoints - numData);
+			} else if (numData > numPoints) {
+				// Add new elements
+				for (var index = numPoints; index < numData; ++index) {
+					this.addElementAndReset(index);
+				}
+			}
+		},
+
+		update: function update(reset) {
+			var points = this.getDataset().metaData;
+
+			var yScale = this.getScaleForId(this.getDataset().yAxisID);
+			var xScale = this.getScaleForId(this.getDataset().xAxisID);
+			var scaleBase;
+
+			if (yScale.min < 0 && yScale.max < 0) {
+				scaleBase = yScale.getPixelForValue(yScale.max);
+			} else if (yScale.min > 0 && yScale.max > 0) {
+				scaleBase = yScale.getPixelForValue(yScale.min);
+			} else {
+				scaleBase = yScale.getPixelForValue(0);
+			}
+
+			// Update Points
+			helpers.each(points, function(point, index) {
+				this.updateElement(point, index, reset);
+			}, this);
+
+		},
+
+		updateElement: function(point, index, reset) {
+			var yScale = this.getScaleForId(this.getDataset().yAxisID);
+			var xScale = this.getScaleForId(this.getDataset().xAxisID);
+			var scaleBase;
+
+			if (yScale.min < 0 && yScale.max < 0) {
+				scaleBase = yScale.getPixelForValue(yScale.max);
+			} else if (yScale.min > 0 && yScale.max > 0) {
+				scaleBase = yScale.getPixelForValue(yScale.min);
+			} else {
+				scaleBase = yScale.getPixelForValue(0);
+			}
+
+			helpers.extend(point, {
+				// Utility
+				_chart: this.chart.chart,
+				_xScale: xScale,
+				_yScale: yScale,
+				_datasetIndex: this.index,
+				_index: index,
+
+				// Desired view properties
+				_model: {
+					x: reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(this.getDataset().data[index], index, this.index, this.chart.isCombo),
+					y: reset ? scaleBase : yScale.getPixelForValue(this.getDataset().data[index], index, this.index),
+					// Appearance
+					radius: reset ? 0 : point.custom && point.custom.radius ? point.custom.radius : this.getRadius(this.getDataset().data[index]),
+					backgroundColor: point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().backgroundColor, index, this.chart.options.elements.point.backgroundColor),
+					borderColor: point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().borderColor, index, this.chart.options.elements.point.borderColor),
+					borderWidth: point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().borderWidth, index, this.chart.options.elements.point.borderWidth),
+
+					// Tooltip
+					hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().hitRadius, index, this.chart.options.elements.point.hitRadius),
+				},
+			});
+
+			point._model.skip = point.custom && point.custom.skip ? point.custom.skip : (isNaN(point._model.x) || isNaN(point._model.y));
+
+			point.pivot();
+		},
+
+		getRadius: function(value) {
+			return value.r || this.chart.options.elements.point.radius;
+		},
+
+		draw: function(ease) {
+			var easingDecimal = ease || 1;
+
+			// Transition and Draw the Points
+			helpers.each(this.getDataset().metaData, function(point, index) {
+				point.transition(easingDecimal);
+				point.draw();
+			}, this);
+
+		},
+
+		setHoverStyle: function(point) {
+			// Point
+			var dataset = this.chart.data.datasets[point._datasetIndex];
+			var index = point._index;
+
+			point._model.radius = point.custom && point.custom.hoverRadius ? point.custom.hoverRadius : (helpers.getValueAtIndexOrDefault(dataset.hoverRadius, index, this.chart.options.elements.point.hoverRadius)) + this.getRadius(this.getDataset().data[point._index]);
+			point._model.backgroundColor = point.custom && point.custom.hoverBackgroundColor ? point.custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.color(point._model.backgroundColor).saturate(0.5).darken(0.1).rgbString());
+			point._model.borderColor = point.custom && point.custom.hoverBorderColor ? point.custom.hoverBorderColor : helpers.getValueAtIndexOrDefault(dataset.hoverBorderColor, index, helpers.color(point._model.borderColor).saturate(0.5).darken(0.1).rgbString());
+			point._model.borderWidth = point.custom && point.custom.hoverBorderWidth ? point.custom.hoverBorderWidth : helpers.getValueAtIndexOrDefault(dataset.hoverBorderWidth, index, point._model.borderWidth);
+		},
+
+		removeHoverStyle: function(point) {
+			var dataset = this.chart.data.datasets[point._datasetIndex];
+			var index = point._index;
+
+			point._model.radius = point.custom && point.custom.radius ? point.custom.radius : this.getRadius(this.getDataset().data[point._index]);
+			point._model.backgroundColor = point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().backgroundColor, index, this.chart.options.elements.point.backgroundColor);
+			point._model.borderColor = point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().borderColor, index, this.chart.options.elements.point.borderColor);
+			point._model.borderWidth = point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().borderWidth, index, this.chart.options.elements.point.borderWidth);
+		}
+	});
+}).call(this);

src/controllers/controller.doughnut.js

@@ -18,6 +18,16 @@
 		},
 		//The percentage of the chart that we cut out of the middle.
 		cutoutPercentage: 50,
+
+		// Need to override these to give a nice default
+		tooltips: {
+			callbacks: {
+				title: function() { return '';},
+				label: function(tooltipItem, data) {
+					return data.labels[tooltipItem.index] + ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+				}
+			}
+		}
 	};
 
 	Chart.defaults.pie = helpers.clone(Chart.defaults.doughnut);
@@ -92,7 +102,7 @@
 			// Make sure that we handle number of datapoints changing
 			if (numData < numArcs) {
 				// Remove excess bars for data points that have been removed
-				this.getDataset().metaData.splice(numData, numArcs - numData)
+				this.getDataset().metaData.splice(numData, numArcs - numData);
 			} else if (numData > numArcs) {
 				// Add new elements
 				for (var index = numArcs; index < numData; ++index) {
@@ -101,18 +111,35 @@
 			}
 		},
 
+		getVisibleDatasetCount: function getVisibleDatasetCount() {
+			return helpers.where(this.chart.data.datasets, function(ds) { return helpers.isDatasetVisible(ds); }).length;
+		},
+
+		// Get index of the dataset in relation to the visible datasets. This allows determining the inner and outer radius correctly
+		getRingIndex: function getRingIndex(datasetIndex) {
+			var ringIndex = 0;
+
+			for (var j = 0; j < datasetIndex; ++j) {
+				if (helpers.isDatasetVisible(this.chart.data.datasets[j])) {
+					++ringIndex;
+				}
+			}
+
+			return ringIndex;
+		},
+
 		update: function update(reset) {
 
 			this.chart.outerRadius = Math.max((helpers.min([this.chart.chart.width, this.chart.chart.height]) / 2) - this.chart.options.elements.arc.borderWidth / 2, 0);
 			this.chart.innerRadius = Math.max(this.chart.options.cutoutPercentage ? (this.chart.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1, 0);
-			this.chart.radiusLength = (this.chart.outerRadius - this.chart.innerRadius) / this.chart.data.datasets.length;
+			this.chart.radiusLength = (this.chart.outerRadius - this.chart.innerRadius) / this.getVisibleDatasetCount();
 
 			this.getDataset().total = 0;
 			helpers.each(this.getDataset().data, function(value) {
 				this.getDataset().total += Math.abs(value);
 			}, this);
 
-			this.outerRadius = this.chart.outerRadius - (this.chart.radiusLength * this.index);
+			this.outerRadius = this.chart.outerRadius - (this.chart.radiusLength * this.getRingIndex(this.index));
 			this.innerRadius = this.outerRadius - this.chart.radiusLength;
 
 			helpers.each(this.getDataset().metaData, function(arc, index) {

src/controllers/controller.line.js

@@ -153,8 +153,6 @@
 					borderDashOffset: line.custom && line.custom.borderDashOffset ? line.custom.borderDashOffset : (this.getDataset().borderDashOffset || this.chart.options.elements.line.borderDashOffset),
 					borderJoinStyle: line.custom && line.custom.borderJoinStyle ? line.custom.borderJoinStyle : (this.getDataset().borderJoinStyle || this.chart.options.elements.line.borderJoinStyle),
 					fill: line.custom && line.custom.fill ? line.custom.fill : (this.getDataset().fill !== undefined ? this.getDataset().fill : this.chart.options.elements.line.fill),
-					skipNull: this.getDataset().skipNull !== undefined ? this.getDataset().skipNull : this.chart.options.elements.line.skipNull,
-					drawNull: this.getDataset().drawNull !== undefined ? this.getDataset().drawNull : this.chart.options.elements.line.drawNull,
 					// Scale
 					scaleTop: yScale.top,
 					scaleBottom: yScale.bottom,
@@ -171,6 +169,49 @@
 			this.updateBezierControlPoints();
 		},
 
+		getPointBackgroundColor: function(point, index) {
+			var backgroundColor = this.chart.options.elements.point.backgroundColor;
+			var dataset = this.getDataset();
+
+			if (point.custom && point.custom.backgroundColor) {
+				backgroundColor = point.custom.backgroundColor;
+			} else if (dataset.pointBackgroundColor) {
+				backgroundColor = helpers.getValueAtIndexOrDefault(dataset.pointBackgroundColor, index, backgroundColor);
+			} else if (dataset.backgroundColor) {
+				backgroundColor = dataset.backgroundColor;
+			}
+
+			return backgroundColor;
+		},
+		getPointBorderColor: function(point, index) {
+			var borderColor = this.chart.options.elements.point.borderColor;
+			var dataset = this.getDataset();
+
+			if (point.custom && point.custom.borderColor) {
+				borderColor = point.custom.borderColor;
+			} else if (dataset.pointBorderColor) {
+				borderColor = helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderColor, index, borderColor);
+			} else if (dataset.borderColor) {
+				borderColor = dataset.borderColor;
+			}
+
+			return borderColor;
+		},
+		getPointBorderWidth: function(point, index) {
+			var borderWidth = this.chart.options.elements.point.borderWidth;
+			var dataset = this.getDataset();
+
+			if (point.custom && point.custom.borderWidth !== undefined) {
+				borderWidth = point.custom.borderWidth;
+			} else if (dataset.pointBorderWidth !== undefined) {
+				borderWidth = helpers.getValueAtIndexOrDefault(dataset.pointBorderWidth, index, borderWidth);
+			} else if (dataset.borderWidth !== undefined) {
+				borderWidth = dataset.borderWidth;
+			}
+
+			return borderWidth;
+		},
+
 		updateElement: function(point, index, reset) {
 			var yScale = this.getScaleForId(this.getDataset().yAxisID);
 			var xScale = this.getScaleForId(this.getDataset().xAxisID);
@@ -195,19 +236,52 @@
 				// Desired view properties
 				_model: {
 					x: xScale.getPixelForValue(this.getDataset().data[index], index, this.index, this.chart.isCombo),
-					y: reset ? scaleBase : yScale.getPixelForValue(this.getDataset().data[index], index, this.index),
+					y: reset ? scaleBase : this.calculatePointY(this.getDataset().data[index], index, this.index, this.chart.isCombo),
 					// Appearance
 					tension: point.custom && point.custom.tension ? point.custom.tension : (this.getDataset().tension || this.chart.options.elements.line.tension),
 					radius: point.custom && point.custom.radius ? point.custom.radius : helpers.getValueAtIndexOrDefault(this.getDataset().radius, index, this.chart.options.elements.point.radius),
-					backgroundColor: point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor, index, this.chart.options.elements.point.backgroundColor),
-					borderColor: point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderColor, index, this.chart.options.elements.point.borderColor),
-					borderWidth: point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth, index, this.chart.options.elements.point.borderWidth),
-					skip: point.custom && point.custom.skip ? point.custom.skip : this.getDataset().data[index] === null,
-
+					backgroundColor: this.getPointBackgroundColor(point, index),
+					borderColor: this.getPointBorderColor(point, index),
+					borderWidth: this.getPointBorderWidth(point, index),
 					// Tooltip
 					hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().hitRadius, index, this.chart.options.elements.point.hitRadius),
 				},
 			});
+
+			point._model.skip = point.custom && point.custom.skip ? point.custom.skip : (isNaN(point._model.x) || isNaN(point._model.y));
+		},
+
+		calculatePointY: function(value, index, datasetIndex, isCombo) {
+
+			var xScale = this.getScaleForId(this.getDataset().xAxisID);
+			var yScale = this.getScaleForId(this.getDataset().yAxisID);
+
+			if (yScale.options.stacked) {
+
+				var sumPos = 0,
+					sumNeg = 0;
+
+				for (var i = this.chart.data.datasets.length - 1; i > datasetIndex; i--) {
+					var ds = this.chart.data.datasets[i];
+					if (helpers.isDatasetVisible(ds)) {
+						if (ds.data[index] < 0) {
+							sumNeg += ds.data[index] || 0;
+						} else {
+							sumPos += ds.data[index] || 0;
+						}
+					}
+				}
+
+				if (value < 0) {
+					return yScale.getPixelForValue(sumNeg + value);
+				} else {
+					return yScale.getPixelForValue(sumPos + value);
+				}
+
+				return yScale.getPixelForValue(value);
+			}
+
+			return yScale.getPixelForValue(value);
 		},
 
 		updateBezierControlPoints: function() {
@@ -220,28 +294,12 @@
 					point._model.tension
 				);
 
-				point._model.controlPointPreviousX = controlPoints.previous.x;
-				point._model.controlPointNextX = controlPoints.next.x;
-
 				// Prevent the bezier going outside of the bounds of the graph
+				point._model.controlPointPreviousX = Math.max(Math.min(controlPoints.previous.x, this.chart.chartArea.right), this.chart.chartArea.left);
+				point._model.controlPointPreviousY = Math.max(Math.min(controlPoints.previous.y, this.chart.chartArea.bottom), this.chart.chartArea.top);
 
-				// Cap outer bezier handles to the upper/lower scale bounds
-				if (controlPoints.next.y > this.chart.chartArea.bottom) {
-					point._model.controlPointNextY = this.chart.chartArea.bottom;
-				} else if (controlPoints.next.y < this.chart.chartArea.top) {
-					point._model.controlPointNextY = this.chart.chartArea.top;
-				} else {
-					point._model.controlPointNextY = controlPoints.next.y;
-				}
-
-				// Cap inner bezier handles to the upper/lower scale bounds
-				if (controlPoints.previous.y > this.chart.chartArea.bottom) {
-					point._model.controlPointPreviousY = this.chart.chartArea.bottom;
-				} else if (controlPoints.previous.y < this.chart.chartArea.top) {
-					point._model.controlPointPreviousY = this.chart.chartArea.top;
-				} else {
-					point._model.controlPointPreviousY = controlPoints.previous.y;
-				}
+				point._model.controlPointNextX = Math.max(Math.min(controlPoints.next.x, this.chart.chartArea.right), this.chart.chartArea.left);
+				point._model.controlPointNextY = Math.max(Math.min(controlPoints.next.y, this.chart.chartArea.bottom), this.chart.chartArea.top);
 
 				// Now pivot the point for animation
 				point.pivot();
@@ -281,9 +339,9 @@
 			var index = point._index;
 
 			point._model.radius = point.custom && point.custom.radius ? point.custom.radius : helpers.getValueAtIndexOrDefault(this.getDataset().radius, index, this.chart.options.elements.point.radius);
-			point._model.backgroundColor = point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor, index, this.chart.options.elements.point.backgroundColor);
-			point._model.borderColor = point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderColor, index, this.chart.options.elements.point.borderColor);
-			point._model.borderWidth = point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth, index, this.chart.options.elements.point.borderWidth);
+			point._model.backgroundColor = this.getPointBackgroundColor(point, index);
+			point._model.borderColor = this.getPointBorderColor(point, index);
+			point._model.borderWidth = this.getPointBorderWidth(point, index);
 		}
 	});
 }).call(this);

src/controllers/controller.polarArea.js

@@ -17,6 +17,16 @@
 		//Boolean - Whether to animate the rotation of the chart
 		animateRotate: true,
 		animateScale: true,
+
+		// Need to override these to give a nice default
+		tooltips: {
+			callbacks: {
+				title: function() { return ''; },
+				label: function(tooltipItem, data) {
+					return data.labels[tooltipItem.index] + ': ' + tooltipItem.yLabel;
+				}
+			}
+		}
 	};
 
 	Chart.controllers.polarArea = function(chart, datasetIndex) {
@@ -87,7 +97,7 @@
 			// Make sure that we handle number of datapoints changing
 			if (numData < numPoints) {
 				// Remove excess bars for data points that have been removed
-				this.getDataset().metaData.splice(numData, numPoints - numData)
+				this.getDataset().metaData.splice(numData, numPoints - numData);
 			} else if (numData > numPoints) {
 				// Add new elements
 				for (var index = numPoints; index < numData; ++index) {
@@ -96,10 +106,14 @@
 			}
 		},
 
+		getVisibleDatasetCount: function getVisibleDatasetCount() {
+			return helpers.where(this.chart.data.datasets, function(ds) { return helpers.isDatasetVisible(ds); }).length;
+		},
+
 		update: function update(reset) {
 			this.chart.outerRadius = Math.max((helpers.min([this.chart.chart.width, this.chart.chart.height]) - this.chart.options.elements.arc.borderWidth / 2) / 2, 0);
 			this.chart.innerRadius = Math.max(this.chart.options.cutoutPercentage ? (this.chart.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1, 0);
-			this.chart.radiusLength = (this.chart.outerRadius - this.chart.innerRadius) / this.chart.data.datasets.length;
+			this.chart.radiusLength = (this.chart.outerRadius - this.chart.innerRadius) / this.getVisibleDatasetCount();
 
 			this.getDataset().total = 0;
 			helpers.each(this.getDataset().data, function(value) {
@@ -139,6 +153,7 @@
 				_chart: this.chart.chart,
 				_datasetIndex: this.index,
 				_index: index,
+				_scale: this.chart.scale,
 
 				// Desired view properties
 				_model: reset ? resetModel : {
@@ -202,12 +217,4 @@
 		},
 
 	});
-
-
-
-	return;
-
-
-	Chart.Type.extend({});
-
 }).call(this);

src/controllers/controller.radar.js

@@ -103,7 +103,7 @@
 			// Make sure that we handle number of datapoints changing
 			if (numData < numPoints) {
 				// Remove excess bars for data points that have been removed
-				this.getDataset().metaData.splice(numData, numPoints - numData)
+				this.getDataset().metaData.splice(numData, numPoints - numData);
 			} else if (numData > numPoints) {
 				// Add new elements
 				for (var index = numPoints; index < numData; ++index) {
@@ -141,8 +141,6 @@
 					borderWidth: this.getDataset().borderWidth || this.chart.options.elements.line.borderWidth,
 					borderColor: this.getDataset().borderColor || this.chart.options.elements.line.borderColor,
 					fill: this.getDataset().fill !== undefined ? this.getDataset().fill : this.chart.options.elements.line.fill, // use the value from the this.getDataset() if it was provided. else fall back to the default
-					skipNull: this.getDataset().skipNull !== undefined ? this.getDataset().skipNull : this.chart.options.elements.line.skipNull,
-					drawNull: this.getDataset().drawNull !== undefined ? this.getDataset().drawNull : this.chart.options.elements.line.drawNull,
 
 					// Scale
 					scaleTop: scale.top,
@@ -169,6 +167,7 @@
 				// Utility
 				_datasetIndex: this.index,
 				_index: index,
+				_scale: this.chart.scale,
 
 				// Desired view properties
 				_model: {
@@ -181,12 +180,13 @@
 					backgroundColor: point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor, index, this.chart.options.elements.point.backgroundColor),
 					borderColor: point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderColor, index, this.chart.options.elements.point.borderColor),
 					borderWidth: point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth, index, this.chart.options.elements.point.borderWidth),
-					skip: point.custom && point.custom.skip ? point.custom.skip : this.getDataset().data[index] === null,
 
 					// Tooltip
 					hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().hitRadius, index, this.chart.options.elements.point.hitRadius),
 				},
 			});
+
+			point._model.skip = point.custom && point.custom.skip ? point.custom.skip : (isNaN(point._model.x) || isNaN(point._model.y));
 		},
 		updateBezierControlPoints: function() {
 			helpers.each(this.getDataset().metaData, function(point, index) {
@@ -197,28 +197,12 @@
 					point._model.tension
 				);
 
-				point._model.controlPointPreviousX = controlPoints.previous.x;
-				point._model.controlPointNextX = controlPoints.next.x;
-
 				// Prevent the bezier going outside of the bounds of the graph
+				point._model.controlPointPreviousX = Math.max(Math.min(controlPoints.previous.x, this.chart.chartArea.right), this.chart.chartArea.left);
+				point._model.controlPointPreviousY = Math.max(Math.min(controlPoints.previous.y, this.chart.chartArea.bottom), this.chart.chartArea.top);
 
-				// Cap outer bezier handles to the upper/lower scale bounds
-				if (controlPoints.next.y > this.chart.chartArea.bottom) {
-					point._model.controlPointNextY = this.chart.chartArea.bottom;
-				} else if (controlPoints.next.y < this.chart.chartArea.top) {
-					point._model.controlPointNextY = this.chart.chartArea.top;
-				} else {
-					point._model.controlPointNextY = controlPoints.next.y;
-				}
-
-				// Cap inner bezier handles to the upper/lower scale bounds
-				if (controlPoints.previous.y > this.chart.chartArea.bottom) {
-					point._model.controlPointPreviousY = this.chart.chartArea.bottom;
-				} else if (controlPoints.previous.y < this.chart.chartArea.top) {
-					point._model.controlPointPreviousY = this.chart.chartArea.top;
-				} else {
-					point._model.controlPointPreviousY = controlPoints.previous.y;
-				}
+				point._model.controlPointNextX = Math.max(Math.min(controlPoints.next.x, this.chart.chartArea.right), this.chart.chartArea.left);
+				point._model.controlPointNextY = Math.max(Math.min(controlPoints.next.y, this.chart.chartArea.bottom), this.chart.chartArea.top);
 
 				// Now pivot the point for animation
 				point.pivot();

src/core/core.controller.js

@@ -4,7 +4,7 @@
 
 	//Declare root variable - window in the browser, global on the server
 	var root = this,
-		previous = root.Chart,
+		Chart = root.Chart,
 		helpers = Chart.helpers;
 
 
@@ -23,10 +23,15 @@
 
 		this.chart = instance;
 		this.config = instance.config;
-		this.data = this.config.data;
 		this.options = this.config.options = helpers.configMerge(Chart.defaults.global, Chart.defaults[this.config.type], this.config.options || {});
 		this.id = helpers.uid();
 
+		Object.defineProperty(this, 'data', {
+			get: function() {
+				return this.config.data;
+			},
+		});
+
 		//Add the chart instance to the global namespace
 		Chart.instances[this.id] = this;
 
@@ -112,7 +117,7 @@
 			}
 		},
 		buildScales: function buildScales() {
-			// Map of scale ID to scale object so we can lookup later 
+			// Map of scale ID to scale object so we can lookup later
 			this.scales = {};
 
 			// Build the x axes
@@ -123,7 +128,7 @@
 						var scale = new ScaleClass({
 							ctx: this.chart.ctx,
 							options: xAxisOptions,
-							data: this.data,
+							chart: this,
 							id: xAxisOptions.id,
 						});
 
@@ -138,7 +143,7 @@
 						var scale = new ScaleClass({
 							ctx: this.chart.ctx,
 							options: yAxisOptions,
-							data: this.data,
+							chart: this,
 							id: yAxisOptions.id,
 						});
 
@@ -152,13 +157,12 @@
 				var scale = new ScaleClass({
 					ctx: this.chart.ctx,
 					options: this.options.scale,
-					data: this.data,
-					chart: this.chart,
+					chart: this,
 				});
 
 				this.scale = scale;
 
-				this.scales['radialScale'] = scale;
+				this.scales.radialScale = scale;
 			}
 
 			Chart.scaleService.update(this, this.chart.width, this.chart.height);
@@ -170,18 +174,22 @@
 				if (!dataset.type) {
 					dataset.type = this.config.type;
 				}
+
 				var type = dataset.type;
 				types.push(type);
+
 				if (dataset.controller) {
 					dataset.controller.updateIndex(datasetIndex);
 					return;
 				}
+
 				dataset.controller = new Chart.controllers[type](this, datasetIndex);
 
 				if (resetNewControllers) {
 					dataset.controller.reset();
 				}
 			}, this);
+
 			if (types.length > 1) {
 				for (var i = 1; i < types.length; i++) {
 					if (types[i] != types[i - 1]) {
@@ -199,6 +207,9 @@
 		},
 
 		update: function update(animationDuration, lazy) {
+			// In case the entire data object changed
+			this.tooltip._data = this.data;
+
 			Chart.scaleService.update(this, this.chart.width, this.chart.height);
 
 			// Make sure dataset controllers are updated and new controllers are reset
@@ -260,7 +271,9 @@
 
 			// Draw each dataset via its respective controller (reversed to support proper line stacking)
 			helpers.each(this.data.datasets, function(dataset, datasetIndex) {
-				dataset.controller.draw(ease);
+				if (helpers.isDatasetVisible(dataset)) {
+					dataset.controller.draw(ease);
+				}
 			}, this);
 
 			// Finally draw the tooltip
@@ -275,12 +288,14 @@
 			var elementsArray = [];
 
 			helpers.each(this.data.datasets, function(dataset, datasetIndex) {
-				helpers.each(dataset.metaData, function(element, index) {
-					if (element.inRange(eventPosition.x, eventPosition.y)) {
-						elementsArray.push(element);
-						return elementsArray;
-					}
-				}, this);
+				if (helpers.isDatasetVisible(dataset)) {
+					helpers.each(dataset.metaData, function(element, index) {
+						if (element.inRange(eventPosition.x, eventPosition.y)) {
+							elementsArray.push(element);
+							return elementsArray;
+						}
+					}, this);
+				}
 			}, this);
 
 			return elementsArray;
@@ -290,12 +305,26 @@
 			var eventPosition = helpers.getRelativePosition(e, this.chart);
 			var elementsArray = [];
 
-			helpers.each(this.data.datasets, function(dataset, datasetIndex) {
-				helpers.each(dataset.metaData, function(element, index) {
-					if (element.inLabelRange(eventPosition.x, eventPosition.y)) {
-						elementsArray.push(element);
+			var found = (function(){
+				for (var i = 0; i < this.data.datasets.length; i++) {
+					if (helpers.isDatasetVisible(this.data.datasets[i])) {
+						for (var j = 0; j < this.data.datasets[i].metaData.length; j++) {
+							if (this.data.datasets[i].metaData[j].inRange(eventPosition.x, eventPosition.y)) {
+								return this.data.datasets[i].metaData[j];
+							}
+						}
 					}
-				}, this);
+				}
+			}).call(this);
+
+			if(!found){
+				return elementsArray;
+			}
+
+			helpers.each(this.data.datasets, function(dataset, dsIndex){
+				if(helpers.isDatasetVisible(dataset)){
+					elementsArray.push(dataset.metaData[found._index]);
+				}
 			}, this);
 
 			return elementsArray;
@@ -305,21 +334,23 @@
 			var eventPosition = helpers.getRelativePosition(e, this.chart);
 			var elementsArray = [];
 
-			for (var datasetIndex = 0; datasetIndex < this.data.datasets.length; datasetIndex++) {
-				for (var elementIndex = 0; elementIndex < this.data.datasets[datasetIndex].metaData.length; elementIndex++) {
-					if (this.data.datasets[datasetIndex].metaData[elementIndex].inLabelRange(eventPosition.x, eventPosition.y)) {
-						helpers.each(this.data.datasets[datasetIndex].metaData, function(element, index) {
-							elementsArray.push(element);
-						}, this);
-					}
+			helpers.each(this.data.datasets, function(dataset, datasetIndex) {
+				if (helpers.isDatasetVisible(dataset)) {
+					helpers.each(dataset.metaData, function(element, elementIndex) {
+						if (element.inLabelRange(eventPosition.x, eventPosition.y)) {
+							helpers.each(dataset.metaData, function(element, index) {
+								elementsArray.push(element);
+							}, this);
+						}
+					}, this);
 				}
-			}
+			}, this);
 
 			return elementsArray.length ? elementsArray : [];
 		},
 
 		generateLegend: function generateLegend() {
-			return helpers.template(this.options.legendTemplate, this);
+			return this.options.legendCallback(this);
 		},
 
 		destroy: function destroy() {
@@ -363,10 +394,12 @@
 		},
 		eventHandler: function eventHandler(e) {
 			this.lastActive = this.lastActive || [];
+			this.lastTooltipActive = this.lastTooltipActive || [];
 
-			// Find Active Elements
+			// Find Active Elements for hover and tooltips
 			if (e.type == 'mouseout') {
 				this.active = [];
+				this.tooltipActive = [];
 			} else {
 				this.active = function() {
 					switch (this.options.hover.mode) {
@@ -380,6 +413,18 @@
 							return e;
 					}
 				}.call(this);
+				this.tooltipActive = function() {
+					switch (this.options.tooltips.mode) {
+						case 'single':
+							return this.getElementAtEvent(e);
+						case 'label':
+							return this.getElementsAtEvent(e);
+						case 'dataset':
+							return this.getDatasetAtEvent(e);
+						default:
+							return e;
+					}
+				}.call(this);
 			}
 
 			// On Hover hook
@@ -395,6 +440,7 @@
 
 			var dataset;
 			var index;
+
 			// Remove styling for last active (even if it may still be active)
 			if (this.lastActive.length) {
 				switch (this.options.hover.mode) {
@@ -404,7 +450,8 @@
 					case 'label':
 					case 'dataset':
 						for (var i = 0; i < this.lastActive.length; i++) {
-							this.data.datasets[this.lastActive[i]._datasetIndex].controller.removeHoverStyle(this.lastActive[i], this.lastActive[i]._datasetIndex, this.lastActive[i]._index);
+							if (this.lastActive[i])
+						  		this.data.datasets[this.lastActive[i]._datasetIndex].controller.removeHoverStyle(this.lastActive[i], this.lastActive[i]._datasetIndex, this.lastActive[i]._index);
 						}
 						break;
 					default:
@@ -420,8 +467,9 @@
 						break;
 					case 'label':
 					case 'dataset':
-						for (var i = 0; i < this.active.length; i++) {
-							this.data.datasets[this.active[i]._datasetIndex].controller.setHoverStyle(this.active[i]);
+						for (var j = 0; j < this.active.length; j++) {
+							if (this.active[j])
+				  				this.data.datasets[this.active[j]._datasetIndex].controller.setHoverStyle(this.active[j]);
 						}
 						break;
 					default:
@@ -435,20 +483,8 @@
 
 				// The usual updates
 				this.tooltip.initialize();
-
-				// Active
-				if (this.active.length) {
-					this.tooltip._model.opacity = 1;
-
-					helpers.extend(this.tooltip, {
-						_active: this.active,
-					});
-
-					this.tooltip.update();
-				} else {
-					// Inactive
-					this.tooltip._model.opacity = 0;
-				}
+				this.tooltip._active = this.tooltipActive;
+				this.tooltip.update();
 			}
 
 			// Hover animations
@@ -463,21 +499,32 @@
 					}
 				}, this);
 
+				helpers.each(this.tooltipActive, function(element, index) {
+					if (element !== this.lastTooltipActive[index]) {
+						changed = true;
+					}
+				}, this);
+
 				// If entering, leaving, or changing elements, animate the change via pivot
-				if ((!this.lastActive.length && this.active.length) ||
-					(this.lastActive.length && !this.active.length) ||
-					(this.lastActive.length && this.active.length && changed)) {
+				if ((this.lastActive.length !== this.active.length) ||
+					(this.lastTooltipActive.length !== this.tooltipActive.length) ||
+					changed) {
 
 					this.stop();
 
-					// We only need to render at this point. Updating will cause scales to be recomputed generating flicker & using more 
+					if (this.options.tooltips.enabled || this.options.tooltips.custom) {
+						this.tooltip.update(true);
+					}
+
+					// We only need to render at this point. Updating will cause scales to be recomputed generating flicker & using more
 					// memory than necessary.
 					this.render(this.options.hover.animationDuration, true);
 				}
 			}
 
-			// Remember Last Active
+			// Remember Last Actives
 			this.lastActive = this.active;
+			this.lastTooltipActive = this.tooltipActive;
 			return this;
 		},
 	});

src/core/core.element.js

@@ -4,7 +4,7 @@
 
 	//Declare root variable - window in the browser, global on the server
 	var root = this,
-		previous = root.Chart,
+		Chart = root.Chart,
 		helpers = Chart.helpers;
 
 	Chart.elements = {};
@@ -38,7 +38,7 @@
 
 				// Init if doesn't exist
 				else if (!this._view[key]) {
-					if (typeof value === 'number') {
+					if (typeof value === 'number' && isNaN(this._view[key]) === false) {
 						this._view[key] = value * ease;
 					} else {
 						this._view[key] = value || null;
@@ -61,14 +61,13 @@
 				}
 				// Number transitions
 				else if (typeof value === 'number') {
-					var startVal = this._start[key] !== undefined ? this._start[key] : 0;
+					var startVal = this._start[key] !== undefined && isNaN(this._start[key]) === false ? this._start[key] : 0;
 					this._view[key] = ((this._model[key] - startVal) * ease) + startVal;
 				}
 				// Everything else
 				else {
 					this._view[key] = value;
 				}
-
 			}, this);
 
 			if (ease === 1) {

src/core/core.helpers.js

@@ -4,7 +4,7 @@
 
 	//Declare root variable - window in the browser, global on the server
 	var root = this,
-		previous = root.Chart;
+		Chart = root.Chart;
 
 	//Global Chart helpers object for utility methods and classes
 	var helpers = Chart.helpers = {};
@@ -135,7 +135,7 @@
 									base[key].push(helpers.configMerge(valueObj.type ? Chart.scaleService.getScaleDefaults(valueObj.type) : {}, valueObj));
 								} else if (valueObj.type !== base[key][index].type) {
 									// Type changed. Bring in the new defaults before we bring in valueObj so that valueObj can override the correct scale defaults
-									base[key][index] = helpers.configMerge(base[key][index], valueObj.type ? Chart.scaleService.getScaleDefaults(valueObj.type) : {}, valueObj)
+									base[key][index] = helpers.configMerge(base[key][index], valueObj.type ? Chart.scaleService.getScaleDefaults(valueObj.type) : {}, valueObj);
 								} else {
 									// Type is the same
 									base[key][index] = helpers.configMerge(base[key][index], valueObj);
@@ -272,7 +272,7 @@
 		},
 		log10 = helpers.log10 = function(x) {
 			if (Math.log10) {
-				return Math.log10(x)
+				return Math.log10(x);
 			} else {
 				return Math.log(x) / Math.LN10;
 			}
@@ -321,21 +321,37 @@
 		aliasPixel = helpers.aliasPixel = function(pixelWidth) {
 			return (pixelWidth % 2 === 0) ? 0 : 0.5;
 		},
-		splineCurve = helpers.splineCurve = function(FirstPoint, MiddlePoint, AfterPoint, t) {
+		splineCurve = helpers.splineCurve = function(firstPoint, middlePoint, afterPoint, t) {
 			//Props to Rob Spencer at scaled innovation for his post on splining between points
 			//http://scaledinnovation.com/analytics/splines/aboutSplines.html
-			var d01 = Math.sqrt(Math.pow(MiddlePoint.x - FirstPoint.x, 2) + Math.pow(MiddlePoint.y - FirstPoint.y, 2)),
-				d12 = Math.sqrt(Math.pow(AfterPoint.x - MiddlePoint.x, 2) + Math.pow(AfterPoint.y - MiddlePoint.y, 2)),
-				fa = t * d01 / (d01 + d12), // scaling factor for triangle Ta
-				fb = t * d12 / (d01 + d12);
+
+			// This function must also respect "skipped" points
+
+			var previous = firstPoint.skip ? middlePoint : firstPoint,
+				current = middlePoint,
+				next = afterPoint.skip ? middlePoint : afterPoint;
+
+			var d01 = Math.sqrt(Math.pow(current.x - previous.x, 2) + Math.pow(current.y - previous.y, 2));
+			var d12 = Math.sqrt(Math.pow(next.x - current.x, 2) + Math.pow(next.y - current.y, 2));
+
+			var s01 = d01 / (d01 + d12);
+			var s12 = d12 / (d01 + d12);
+
+			// If all points are the same, s01 & s02 will be inf
+			s01 = isNaN(s01) ? 0 : s01;
+			s12 = isNaN(s12) ? 0 : s12;
+
+			var fa = t * s01; // scaling factor for triangle Ta
+			var fb = t * s12;
+
 			return {
 				previous: {
-					x: MiddlePoint.x - fa * (AfterPoint.x - FirstPoint.x),
-					y: MiddlePoint.y - fa * (AfterPoint.y - FirstPoint.y)
+					x: current.x - fa * (next.x - previous.x),
+					y: current.y - fa * (next.y - previous.y)
 				},
 				next: {
-					x: MiddlePoint.x + fb * (AfterPoint.x - FirstPoint.x),
-					y: MiddlePoint.y + fb * (AfterPoint.y - FirstPoint.y)
+					x: current.x + fb * (next.x - previous.x),
+					y: current.y + fb * (next.y - previous.y)
 				}
 			};
 		},
@@ -382,57 +398,6 @@
 
 			return niceFraction * Math.pow(10, exponent);
 		},
-		/* jshint ignore:start */
-		// Blows up jshint errors based on the new Function constructor
-		//Templating methods
-		//Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/
-		templateStringCache = {},
-		template = helpers.template = function(templateString, valuesObject) {
-
-			// If templateString is function rather than string-template - call the function for valuesObject
-
-			if (templateString instanceof Function) {
-				return templateString(valuesObject);
-			}
-
-			function tmpl(str, data) {
-				// Figure out if we're getting a template, or if we need to
-				// load the template - and be sure to cache the result.
-				var fn;
-
-				if (templateStringCache.hasOwnProperty(str)) {
-					fn = templateStringCache[str];
-				} else {
-					// Generate a reusable function that will serve as a template
-					// generator (and which will be cached).
-					var functionCode = "var p=[],print=function(){p.push.apply(p,arguments);};" +
-
-						// Introduce the data as local variables using with(){}
-						"with(obj){p.push('" +
-
-						// Convert the template into pure JavaScript
-						str
-						.replace(/[\r\t\n]/g, " ")
-						.split("<%").join("\t")
-						.replace(/((^|%>)[^\t]*)'/g, "$1\r")
-						.replace(/\t=(.*?)%>/g, "',$1,'")
-						.split("\t").join("');")
-						.split("%>").join("p.push('")
-						.split("\r").join("\\'") +
-						"');}return p.join('');";
-					fn = new Function("obj", functionCode);
-
-					// Cache the result
-					templateStringCache[str] = fn;
-				}
-
-				// Provide some basic currying to the user
-				return data ? fn(data) : fn;
-			}
-			return tmpl(templateString, valuesObject);
-		},
-		/* jshint ignore:end */
-		//--Animation methods
 		//Easing functions adapted from Robert Penner's easing equations
 		//http://www.robertpenner.com/easing/
 		easingEffects = helpers.easingEffects = {
@@ -659,7 +624,7 @@
 				canvas = evt.currentTarget || evt.srcElement,
 				boundingRect = canvas.getBoundingClientRect();
 
-			if (e.touches) {
+			if (e.touches && e.touches.length > 0) {
 				mouseX = e.touches[0].clientX;
 				mouseY = e.touches[0].clientY;
 
@@ -669,7 +634,7 @@
 			}
 
 			// Scale mouse coordinates into canvas coordinates
-			// by following the pattern laid out by 'jerryj' in the comments of 
+			// by following the pattern laid out by 'jerryj' in the comments of
 			// http://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
 
 			// We divide by the current device pixel ratio, because the canvas is scaled up by that amount in each direction. However
@@ -776,12 +741,12 @@
 			var ctx = chart.ctx;
 			var width = chart.canvas.width;
 			var height = chart.canvas.height;
-			chart.currentDevicePixelRatio = window.devicePixelRatio || 1;
+			var pixelRatio = chart.currentDevicePixelRatio = window.devicePixelRatio || 1;
 
-			if (window.devicePixelRatio !== 1) {
-				ctx.canvas.height = height * window.devicePixelRatio;
-				ctx.canvas.width = width * window.devicePixelRatio;
-				ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
+			if (pixelRatio !== 1) {
+				ctx.canvas.height = height * pixelRatio;
+				ctx.canvas.width = width * pixelRatio;
+				ctx.scale(pixelRatio, pixelRatio);
 
 				ctx.canvas.style.width = width + 'px';
 				ctx.canvas.style.height = height + 'px';
@@ -789,7 +754,7 @@
 				// Store the device pixel ratio so that we can go backwards in `destroy`.
 				// The devicePixelRatio changes with zoom, so there are no guarantees that it is the same
 				// when destroy is called
-				chart.originalDevicePixelRatio = chart.originalDevicePixelRatio || window.devicePixelRatio;
+				chart.originalDevicePixelRatio = chart.originalDevicePixelRatio || pixelRatio;
 			}
 		},
 		//-- Canvas methods
@@ -837,7 +802,7 @@
 				// can use classlist
 				hiddenIframe.classlist.add(hiddenIframeClass);
 			} else {
-				hiddenIframe.setAttribute('class', hiddenIframeClass)
+				hiddenIframe.setAttribute('class', hiddenIframeClass);
 			}
 
 			// Set the style
@@ -860,14 +825,14 @@
 				if (callback) {
 					callback();
 				}
-			}
+			};
 		},
 		removeResizeListener = helpers.removeResizeListener = function(node) {
 			var hiddenIframe = node.querySelector('.chartjs-hidden-iframe');
 
 			// Remove the resize detect iframe
 			if (hiddenIframe) {
-				hiddenIframe.remove();
+				hiddenIframe.parentNode.removeChild(hiddenIframe);
 			}
 		},
 		isArray = helpers.isArray = function(obj) {
@@ -875,6 +840,8 @@
 				return Object.prototype.toString.call(arg) === '[object Array]';
 			}
 			return Array.isArray(obj);
+		},
+		isDatasetVisible = helpers.isDatasetVisible = function(dataset) {
+			return !dataset.hidden;
 		};
-
 }).call(this);

src/core/core.js

@@ -57,20 +57,19 @@
 		// High pixel density displays - multiply the size of the canvas height/width by the device pixel ratio, then scale.
 		Chart.helpers.retinaScale(this);
 
+		if (config) {
+			this.controller = new Chart.Controller(this);
+		}
+
 		// Always bind this so that if the responsive state changes we still work
 		var _this = this;
 		Chart.helpers.addResizeListener(context.canvas.parentNode, function() {
-			if (config.options.responsive) {
+			if (_this.controller && _this.controller.config.options.responsive) {
 				_this.controller.resize();
 			}
 		});
 
-		if (config) {
-			this.controller = new Chart.Controller(this);
-			return this.controller;
-		}
-
-		return this;
+		return this.controller ? this.controller : this;
 
 	};
 
@@ -80,7 +79,7 @@
 			responsive: true,
 			responsiveAnimationDuration: 0,
 			maintainAspectRatio: true,
-			events: ["mousemove", "mouseout", "click", "touchstart", "touchmove", "touchend"],
+			events: ["mousemove", "mouseout", "click", "touchstart", "touchmove"],
 			hover: {
 				onHover: null,
 				mode: 'single',
@@ -92,8 +91,21 @@
 			// Element defaults defined in element extensions
 			elements: {},
 
-			// Legend template string
-			legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i = 0; i < data.datasets.length; i++){%><li><span style=\"background-color:<%=data.datasets[i].backgroundColor%>\"><%if(data.datasets[i].label){%><%=data.datasets[i].label%><%}%></span></li><%}%></ul>",
+			// Legend callback string
+			legendCallback: function(chart) {
+				var text = [];
+				text.push('<ul class="' + chart.id + '-legend">');
+				for (var i = 0; i < chart.data.datasets.length; i++) {
+					text.push('<li><span style="background-color:' + chart.data.datasets[i].backgroundColor + '">');
+					if (chart.data.datasets[i].label) {
+						text.push(chart.data.datasets[i].label);
+					}
+					text.push('</span></li>');
+				}
+				text.push('</ul>');
+
+				return text.join("");
+			}
 		},
 	};
 

src/core/core.scale.js

@@ -10,7 +10,7 @@
 
 		// grid line settings
 		gridLines: {
-			show: true,
+			display: true,
 			color: "rgba(0, 0, 0, 0.1)",
 			lineWidth: 1,
 			drawOnChartArea: true,
@@ -31,7 +31,7 @@
 			labelString: '',
 
 			// display property
-			show: false,
+			display: false,
 		},
 
 		// label settings
@@ -46,8 +46,10 @@
 			mirror: false,
 			padding: 10,
 			reverse: false,
-			show: true,
-			template: "<%=value%>",
+			display: true,
+			callback: function(value) {
+				return '' + value;
+			},
 		},
 	};
 
@@ -103,9 +105,16 @@
 		setDimensions: function() {
 			// Set the unconstrained dimension before label rotation
 			if (this.isHorizontal()) {
+				// Reset position before calculating rotation
 				this.width = this.maxWidth;
+				this.left = 0;
+				this.right = this.width;
 			} else {
 				this.height = this.maxHeight;
+
+				// Reset position before calculating rotation
+				this.top = 0;
+				this.bottom = this.height;
 			}
 
 			// Reset padding
@@ -126,14 +135,12 @@
 		convertTicksToLabels: function() {
 			// Convert ticks to strings
 			this.ticks = this.ticks.map(function(numericalTick, index, ticks) {
-				if (this.options.ticks.userCallback) {
-					return this.options.ticks.userCallback(numericalTick, index, ticks);
-				} else {
-					return helpers.template(this.options.ticks.template, {
-						value: numericalTick
-					});
-				}
-			}, this);
+					if (this.options.ticks.userCallback) {
+						return this.options.ticks.userCallback(numericalTick, index, ticks);
+					}
+					return this.options.ticks.callback(numericalTick, index, ticks);
+				},
+				this);
 		},
 		afterTickToLabelConversion: helpers.noop,
 
@@ -224,26 +231,26 @@
 			if (this.isHorizontal()) {
 				this.minSize.width = this.maxWidth; // fill all the width
 			} else {
-				this.minSize.width = this.options.gridLines.show && this.options.display ? 10 : 0;
+				this.minSize.width = this.options.gridLines.display && this.options.display ? 10 : 0;
 			}
 
 			// height
 			if (this.isHorizontal()) {
-				this.minSize.height = this.options.gridLines.show && this.options.display ? 10 : 0;
+				this.minSize.height = this.options.gridLines.display && this.options.display ? 10 : 0;
 			} else {
 				this.minSize.height = this.maxHeight; // fill all the height
 			}
 
 			// Are we showing a title for the scale?
-            if (this.options.scaleLabel.show) {
-                if (this.isHorizontal()) {
-                    this.minSize.height += (this.options.scaleLabel.fontSize * 1.5);
-                } else {
-                    this.minSize.width += (this.options.scaleLabel.fontSize * 1.5);
-                }
-            }
+			if (this.options.scaleLabel.display) {
+				if (this.isHorizontal()) {
+					this.minSize.height += (this.options.scaleLabel.fontSize * 1.5);
+				} else {
+					this.minSize.width += (this.options.scaleLabel.fontSize * 1.5);
+				}
+			}
 
-			if (this.options.ticks.show && this.options.display) {
+			if (this.options.ticks.display && this.options.display) {
 				// Don't bother fitting the ticks if we are not showing them
 				var labelFont = helpers.fontString(this.options.ticks.fontSize,
 					this.options.ticks.fontStyle, this.options.ticks.fontFamily);
@@ -252,6 +259,8 @@
 					// A horizontal axis is more constrained by the height.
 					var maxLabelHeight = this.maxHeight - this.minSize.height;
 					var longestLabelWidth = helpers.longestText(this.ctx, labelFont, this.ticks);
+
+					// TODO - improve this calculation
 					var labelHeight = (Math.sin(helpers.toRadians(this.labelRotation)) * longestLabelWidth) + 1.5 * this.options.ticks.fontSize;
 
 					this.minSize.height = Math.min(this.maxHeight, this.minSize.height + labelHeight);
@@ -273,6 +282,11 @@
 					var maxLabelWidth = this.maxWidth - this.minSize.width;
 					var largestTextWidth = helpers.longestText(this.ctx, labelFont, this.ticks);
 
+					// Account for padding
+					if (!this.options.ticks.mirror) {
+						largestTextWidth += this.options.ticks.padding;
+					}
+
 					if (largestTextWidth < maxLabelWidth) {
 						// We don't need all the room
 						this.minSize.width += largestTextWidth;
@@ -309,6 +323,29 @@
 			return this.options.position == "top" || this.options.position == "bottom";
 		},
 
+		// Get the correct value. NaN bad inputs, If the value type is object get the x or y based on whether we are horizontal or not
+		getRightValue: function getRightValue(rawValue) {
+			// Null and undefined values first
+			if (rawValue === null || typeof(rawValue) === 'undefined') {
+				return NaN;
+			}
+			// isNaN(object) returns true, so make sure NaN is checking for a number
+			if (typeof(rawValue) === 'number' && isNaN(rawValue)) {
+				return NaN;
+			}
+			// If it is in fact an object, dive in one more level
+			if (typeof(rawValue) === "object") {
+				return getRightValue(this.isHorizontal() ? rawValue.x : rawValue.y);
+			}
+
+			// Value is good, return it
+			return rawValue;
+		},
+
+		// Used to get the value to display in the tooltip for the data at the given index
+		// function getLabelForIndex(index, datasetIndex)
+		getLabelForIndex: helpers.noop,
+
 		// Used to get data value locations.  Value can either be an index or a numerical value
 		getPixelForValue: helpers.noop,
 
@@ -337,7 +374,7 @@
 
 				return this.left + Math.round(valueOffset);
 			} else {
-				return this.top + (decimal * (this.height / this.ticks.length));
+				return this.top + (decimal * this.height);
 			}
 		},
 
@@ -352,8 +389,9 @@
 				var scaleLabelX;
 				var scaleLabelY;
 
-				// Make sure we draw text in the correct color
+				// Make sure we draw text in the correct color and font
 				this.ctx.fillStyle = this.options.ticks.fontColor;
+				var labelFont = helpers.fontString(this.options.ticks.fontSize, this.options.ticks.fontStyle, this.options.ticks.fontFamily);
 
 				if (this.isHorizontal()) {
 					setContextLineSettings = true;
@@ -373,7 +411,7 @@
 						var xLineValue = this.getPixelForTick(index); // xvalues for grid lines
 						var xLabelValue = this.getPixelForTick(index, this.options.gridLines.offsetGridLines); // x values for ticks (need to consider offsetLabel option)
 
-						if (this.options.gridLines.show) {
+						if (this.options.gridLines.display) {
 							if (index === (typeof this.zeroLineIndex !== 'undefined' ? this.zeroLineIndex : 0)) {
 								// Draw the first index specially
 								this.ctx.lineWidth = this.options.gridLines.zeroLineWidth;
@@ -405,11 +443,11 @@
 							this.ctx.stroke();
 						}
 
-						if (this.options.ticks.show) {
+						if (this.options.ticks.display) {
 							this.ctx.save();
 							this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 : this.options.position === "top" ? this.bottom - 10 : this.top + 10);
 							this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
-							this.ctx.font = this.font;
+							this.ctx.font = labelFont;
 							this.ctx.textAlign = (isRotated) ? "right" : "center";
 							this.ctx.textBaseline = (isRotated) ? "middle" : this.options.position === "top" ? "bottom" : "top";
 							this.ctx.fillText(label, 0, 0);
@@ -417,10 +455,11 @@
 						}
 					}, this);
 
-					if (this.options.scaleLabel.show) {
+					if (this.options.scaleLabel.display) {
 						// Draw the scale label
 						this.ctx.textAlign = "center";
 						this.ctx.textBaseline = 'middle';
+						this.ctx.fillStyle = this.options.scaleLabel.fontColor; // render in correct colour
 						this.ctx.font = helpers.fontString(this.options.scaleLabel.fontSize, this.options.scaleLabel.fontStyle, this.options.scaleLabel.fontFamily);
 
 						scaleLabelX = this.left + ((this.right - this.left) / 2); // midpoint of the width
@@ -435,9 +474,14 @@
 					var xTickEnd = this.options.position == "right" ? this.left + 5 : this.right;
 
 					helpers.each(this.ticks, function(label, index) {
+						// If the callback returned a null or undefined value, do not draw this line
+						if (label === undefined || label === null) {
+							return;
+						}
+
 						var yLineValue = this.getPixelForTick(index); // xvalues for grid lines
 
-						if (this.options.gridLines.show) {
+						if (this.options.gridLines.display) {
 							if (index === (typeof this.zeroLineIndex !== 'undefined' ? this.zeroLineIndex : 0)) {
 								// Draw the first index specially
 								this.ctx.lineWidth = this.options.gridLines.zeroLineWidth;
@@ -469,7 +513,7 @@
 							this.ctx.stroke();
 						}
 
-						if (this.options.ticks.show) {
+						if (this.options.ticks.display) {
 							var xLabelValue;
 							var yLabelValue = this.getPixelForTick(index, this.options.gridLines.offsetGridLines); // x values for ticks (need to consider offsetLabel option)
 
@@ -494,17 +538,17 @@
 								}
 							}
 
-							
+
 							this.ctx.translate(xLabelValue, yLabelValue);
 							this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
-							this.ctx.font = this.font;
+							this.ctx.font = labelFont;
 							this.ctx.textBaseline = "middle";
 							this.ctx.fillText(label, 0, 0);
 							this.ctx.restore();
 						}
 					}, this);
 
-					if (this.options.scaleLabel.show) {
+					if (this.options.scaleLabel.display) {
 						// Draw the scale label
 						scaleLabelX = this.options.position == 'left' ? this.left + (this.options.scaleLabel.fontSize / 2) : this.right - (this.options.scaleLabel.fontSize / 2);
 						scaleLabelY = this.top + ((this.bottom - this.top) / 2);
@@ -514,6 +558,7 @@
 						this.ctx.translate(scaleLabelX, scaleLabelY);
 						this.ctx.rotate(rotation);
 						this.ctx.textAlign = "center";
+						this.ctx.fillStyle = this.options.scaleLabel.fontColor; // render in correct colour
 						this.ctx.font = helpers.fontString(this.options.scaleLabel.fontSize, this.options.scaleLabel.fontStyle, this.options.scaleLabel.fontFamily);
 						this.ctx.textBaseline = 'middle';
 						this.ctx.fillText(this.options.scaleLabel.labelString, 0, 0);

src/core/core.scaleService.js

@@ -19,13 +19,14 @@
 		defaults: {},
 		registerScaleType: function(type, scaleConstructor, defaults) {
 			this.constructors[type] = scaleConstructor;
-			this.defaults[type] = helpers.scaleMerge(Chart.defaults.scale, defaults);
+			this.defaults[type] = helpers.clone(defaults);
 		},
 		getScaleConstructor: function(type) {
 			return this.constructors.hasOwnProperty(type) ? this.constructors[type] : undefined;
 		},
 		getScaleDefaults: function(type) {
-			return this.defaults.hasOwnProperty(type) ? this.defaults[type] : {};
+			// Return the scale defaults merged with the global settings so that we always use the latest ones
+			return this.defaults.hasOwnProperty(type) ? helpers.scaleMerge(Chart.defaults.scale, this.defaults[type]) : {};
 		},
 		// The interesting function
 		update: function(chartInstance, width, height) {

src/core/core.tooltip.js

@@ -9,35 +9,87 @@
 	Chart.defaults.global.tooltips = {
 		enabled: true,
 		custom: null,
+		mode: 'single',
 		backgroundColor: "rgba(0,0,0,0.8)",
-		fontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-		fontSize: 10,
-		fontStyle: "normal",
-		fontColor: "#fff",
 		titleFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
 		titleFontSize: 12,
 		titleFontStyle: "bold",
-		titleFontColor: "#fff",
+		titleSpacing: 2,
+		titleMarginBottom: 6,
+		titleColor: "#fff",
+		titleAlign: "left",
+		bodyFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+		bodyFontSize: 12,
+		bodyFontStyle: "normal",
+		bodySpacing: 2,
+		bodyColor: "#fff",
+		bodyAlign: "left",
+		footerFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+		footerFontSize: 12,
+		footerFontStyle: "bold",
+		footerSpacing: 2,
+		footerMarginTop: 6,
+		footerColor: "#fff",
+		footerAlign: "left",
 		yPadding: 6,
 		xPadding: 6,
-		caretSize: 8,
+		caretSize: 5,
 		cornerRadius: 6,
 		xOffset: 10,
-		template: [
-			'<% if(label){ %>',
-			'<%=label %>: ',
-			'<% } %>',
-			'<%=value %>',
-		].join(''),
-		multiTemplate: [
-			'<%if (datasetLabel){ %>',
-			'<%=datasetLabel %>: ',
-			'<% } %>',
-			'<%=value %>'
-		].join(''),
 		multiKeyBackground: '#fff',
+		callbacks: {
+			// Args are: (tooltipItems, data)
+			beforeTitle: helpers.noop,
+			title: function(tooltipItems, data) {
+				// Pick first xLabel for now
+				var title = '';
+
+				if (tooltipItems.length > 0) {
+					if (tooltipItems[0].xLabel) {
+						title = tooltipItems[0].xLabel;
+					} else if (data.labels.length > 0 && tooltipItems[0].index < data.labels.length) {
+						title = data.labels[tooltipItems[0].index];
+					}
+				}
+
+				return title;
+			},
+			afterTitle: helpers.noop,
+
+			// Args are: (tooltipItems, data)
+			beforeBody: helpers.noop,
+
+			// Args are: (tooltipItem, data)
+			beforeLabel: helpers.noop,
+			label: function(tooltipItem, data) {
+				var datasetLabel = data.datasets[tooltipItem.datasetIndex].label || '';
+				return datasetLabel + ': ' + tooltipItem.yLabel;
+			},
+			afterLabel: helpers.noop,
+
+			// Args are: (tooltipItems, data)
+			afterBody: helpers.noop,
+
+			// Args are: (tooltipItems, data)
+			beforeFooter: helpers.noop,
+			footer: helpers.noop,
+			afterFooter: helpers.noop,
+		},
 	};
 
+	// Helper to push or concat based on if the 2nd parameter is an array or not
+	function pushOrConcat(base, toPush) {
+		if (toPush) {
+			if (helpers.isArray(toPush)) {
+				base = base.concat(toPush);
+			} else {
+				base.push(toPush);
+			}
+		}
+
+		return base;
+	}
+
 	Chart.Tooltip = Chart.Element.extend({
 		initialize: function() {
 			var options = this._options;
@@ -48,20 +100,34 @@
 					yPadding: options.tooltips.yPadding,
 					xOffset: options.tooltips.xOffset,
 
-					// Labels
-					textColor: options.tooltips.fontColor,
-					_fontFamily: options.tooltips.fontFamily,
-					_fontStyle: options.tooltips.fontStyle,
-					fontSize: options.tooltips.fontSize,
+					// Body
+					bodyColor: options.tooltips.bodyColor,
+					_bodyFontFamily: options.tooltips.bodyFontFamily,
+					_bodyFontStyle: options.tooltips.bodyFontStyle,
+					_bodyAlign: options.tooltips.bodyAlign,
+					bodyFontSize: options.tooltips.bodyFontSize,
+					bodySpacing: options.tooltips.bodySpacing,
 
 					// Title
-					titleTextColor: options.tooltips.titleFontColor,
+					titleColor: options.tooltips.titleColor,
 					_titleFontFamily: options.tooltips.titleFontFamily,
 					_titleFontStyle: options.tooltips.titleFontStyle,
 					titleFontSize: options.tooltips.titleFontSize,
+					_titleAlign: options.tooltips.titleAlign,
+					titleSpacing: options.tooltips.titleSpacing,
+					titleMarginBottom: options.tooltips.titleMarginBottom,
+
+					// Footer
+					footerColor: options.tooltips.footerColor,
+					_footerFontFamily: options.tooltips.footerFontFamily,
+					_footerFontStyle: options.tooltips.footerFontStyle,
+					footerFontSize: options.tooltips.footerFontSize,
+					_footerAlign: options.tooltips.footerAlign,
+					footerSpacing: options.tooltips.footerSpacing,
+					footerMarginTop: options.tooltips.footerMarginTop,
 
 					// Appearance
-					caretHeight: options.tooltips.caretSize,
+					caretSize: options.tooltips.caretSize,
 					cornerRadius: options.tooltips.cornerRadius,
 					backgroundColor: options.tooltips.backgroundColor,
 					opacity: 0,
@@ -69,278 +135,385 @@
 				},
 			});
 		},
-		update: function() {
+
+		// Get the title
+		// Args are: (tooltipItem, data)
+		getTitle: function() {
+			var beforeTitle = this._options.tooltips.callbacks.beforeTitle.apply(this, arguments),
+				title = this._options.tooltips.callbacks.title.apply(this, arguments),
+				afterTitle = this._options.tooltips.callbacks.afterTitle.apply(this, arguments);
+
+			var lines = [];
+			lines = pushOrConcat(lines, beforeTitle);
+			lines = pushOrConcat(lines, title);
+			lines = pushOrConcat(lines, afterTitle);
+
+			return lines;
+		},
+
+		// Args are: (tooltipItem, data)
+		getBeforeBody: function() {
+			var lines = this._options.tooltips.callbacks.beforeBody.call(this, arguments);
+			return helpers.isArray(lines) ? lines : [lines];
+		},
+
+		// Args are: (tooltipItem, data)
+		getBody: function(tooltipItems, data) {
+			var lines = [];
+
+			helpers.each(tooltipItems, function(bodyItem) {
+				var beforeLabel = this._options.tooltips.callbacks.beforeLabel.call(this, bodyItem, data) || '';
+				var bodyLabel = this._options.tooltips.callbacks.label.call(this, bodyItem, data) || '';
+				var afterLabel = this._options.tooltips.callbacks.afterLabel.call(this, bodyItem, data) || '';
+
+				lines.push(beforeLabel + bodyLabel + afterLabel);
+			}, this);
+
+			return lines;
+		},
+
+		// Args are: (tooltipItem, data)
+		getAfterBody: function() {
+			var lines = this._options.tooltips.callbacks.afterBody.call(this, arguments);
+			return helpers.isArray(lines) ? lines : [lines];
+		},
+
+		// Get the footer and beforeFooter and afterFooter lines
+		// Args are: (tooltipItem, data)
+		getFooter: function() {
+			var beforeFooter = this._options.tooltips.callbacks.beforeFooter.apply(this, arguments);
+			var footer = this._options.tooltips.callbacks.footer.apply(this, arguments);
+			var afterFooter = this._options.tooltips.callbacks.afterFooter.apply(this, arguments);
+
+			var lines = [];
+			lines = pushOrConcat(lines, beforeFooter);
+			lines = pushOrConcat(lines, footer);
+			lines = pushOrConcat(lines, afterFooter);
+
+			return lines;
+		},
+
+		getAveragePosition: function(elements){
+
+			if(!elements.length){
+				return false;
+			}
+
+			var xPositions = [];
+			var yPositions = [];
+
+			helpers.each(elements, function(el){
+				if(el) {
+					var pos = el.tooltipPosition();
+					xPositions.push(pos.x);
+					yPositions.push(pos.y);
+				}
+			});
+
+			var x = 0, y = 0;
+			for (var i = 0; i < xPositions.length; i++) {
+				x += xPositions[i];
+				y += yPositions[i];
+			}
+
+			return {
+				x: Math.round(x / xPositions.length),
+				y: Math.round(y / xPositions.length)
+			};
+
+		},
+
+		update: function(changed) {
 
 			var ctx = this._chart.ctx;
 
-			switch (this._options.hover.mode) {
-				case 'single':
-					helpers.extend(this._model, {
-						text: helpers.template(this._options.tooltips.template, {
-							// These variables are available in the template function. Add others here
-							element: this._active[0],
-							value: this._data.datasets[this._active[0]._datasetIndex].data[this._active[0]._index],
-							label: this._active[0]._model.label !== undefined ? this._active[0]._model.label : this._data.labels ? this._data.labels[this._active[0]._index] : '',
-						}),
+			if(this._active.length){
+				this._model.opacity = 1;
+
+				var element = this._active[0],
+					labelColors = [],
+					tooltipPosition;
+
+				var tooltipItems = [];
+
+				if (this._options.tooltips.mode == 'single') {
+					var yScale = element._yScale || element._scale; // handle radar || polarArea charts
+					tooltipItems.push({
+						xLabel: element._xScale ? element._xScale.getLabelForIndex(element._index, element._datasetIndex) : '',
+						yLabel: yScale ? yScale.getLabelForIndex(element._index, element._datasetIndex) : '',
+						index: element._index,
+						datasetIndex: element._datasetIndex,
 					});
-
-					var tooltipPosition = this._active[0].tooltipPosition();
-					helpers.extend(this._model, {
-						x: Math.round(tooltipPosition.x),
-						y: Math.round(tooltipPosition.y),
-						caretPadding: tooltipPosition.padding
-					});
-
-					break;
-
-				case 'label':
-
-					// Tooltip Content
-
-					var dataArray,
-						dataIndex;
-
-					var labels = [],
-						colors = [];
-
-					for (var i = this._data.datasets.length - 1; i >= 0; i--) {
-						dataArray = this._data.datasets[i].metaData;
-						dataIndex = helpers.indexOf(dataArray, this._active[0]);
-						if (dataIndex !== -1) {
-							break;
+					tooltipPosition = this.getAveragePosition(this._active);
+				} else {
+					helpers.each(this._data.datasets, function(dataset, datasetIndex) {
+						if (!helpers.isDatasetVisible(dataset)) {
+							return;
 						}
-					}
+						var currentElement = dataset.metaData[element._index];
+						if (currentElement) {
+							var yScale = element._yScale || element._scale; // handle radar || polarArea charts
 
-					var medianPosition = (function(index) {
-						// Get all the points at that particular index
-						var elements = [],
-							dataCollection,
-							xPositions = [],
-							yPositions = [],
-							xMax,
-							yMax,
-							xMin,
-							yMin;
-						helpers.each(this._data.datasets, function(dataset) {
-							dataCollection = dataset.metaData;
-							if (dataCollection[dataIndex] && dataCollection[dataIndex].hasValue()) {
-								elements.push(dataCollection[dataIndex]);
-							}
-						}, this);
-
-						// Reverse labels if stacked
-						helpers.each(this._options.stacked ? elements.reverse() : elements, function(element) {
-							xPositions.push(element._view.x);
-							yPositions.push(element._view.y);
-
-							//Include any colour information about the element
-							labels.push(helpers.template(this._options.tooltips.multiTemplate, {
-								// These variables are available in the template function. Add others here
-								element: element,
-								datasetLabel: this._data.datasets[element._datasetIndex].label,
-								value: this._data.datasets[element._datasetIndex].data[element._index],
-							}));
-							colors.push({
-								fill: element._view.backgroundColor,
-								stroke: element._view.borderColor
+							tooltipItems.push({
+								xLabel: currentElement._xScale ? currentElement._xScale.getLabelForIndex(currentElement._index, currentElement._datasetIndex) : '',
+								yLabel: yScale ? yScale.getLabelForIndex(currentElement._index, currentElement._datasetIndex) : '',
+								index: element._index,
+								datasetIndex: datasetIndex,
 							});
-
-						}, this);
-
-						yMin = helpers.min(yPositions);
-						yMax = helpers.max(yPositions);
-
-						xMin = helpers.min(xPositions);
-						xMax = helpers.max(xPositions);
-
-						return {
-							x: (xMin > this._chart.width / 2) ? xMin : xMax,
-							y: (yMin + yMax) / 2,
-						};
-					}).call(this, dataIndex);
-
-					// Apply for now
-					helpers.extend(this._model, {
-						x: medianPosition.x,
-						y: medianPosition.y,
-						labels: labels,
-						title: (function() {
-							return this._data.timeLabels ? this._data.timeLabels[this._active[0]._index] :
-								(this._data.labels && this._data.labels.length) ? this._data.labels[this._active[0]._index] :
-								'';
-						}).call(this),
-						legendColors: colors,
-						legendBackgroundColor: this._options.tooltips.multiKeyBackground,
+						}
 					});
 
+					helpers.each(this._active, function(active, i) {
+						if (active) {
+						  labelColors.push({
+						  	borderColor: active._view.borderColor,
+						  	backgroundColor: active._view.backgroundColor
+						  });
+						}
+					}, this);
 
-					// Calculate Appearance Tweaks
+					tooltipPosition = this.getAveragePosition(this._active);
+					tooltipPosition.y = this._active[0]._yScale.getPixelForDecimal(0.5);
+				}
 
-					this._model.height = (labels.length * this._model.fontSize) + ((labels.length - 1) * (this._model.fontSize / 2)) + (this._model.yPadding * 2) + this._model.titleFontSize * 1.5;
+				// Build the Text Lines
+				helpers.extend(this._model, {
+					title: this.getTitle(tooltipItems, this._data),
+					beforeBody: this.getBeforeBody(tooltipItems, this._data),
+					body: this.getBody(tooltipItems, this._data),
+					afterBody: this.getAfterBody(tooltipItems, this._data),
+					footer: this.getFooter(tooltipItems, this._data),
+				});
 
-					var titleWidth = ctx.measureText(this._model.title).width,
-						//Label has a legend square as well so account for this.
-						labelWidth = helpers.longestText(ctx, this.font, labels) + this._model.fontSize + 3,
-						longestTextWidth = helpers.max([labelWidth, titleWidth]);
+				helpers.extend(this._model, {
+					x: Math.round(tooltipPosition.x),
+					y: Math.round(tooltipPosition.y),
+					caretPadding: tooltipPosition.padding,
+					labelColors: labelColors,
+				});
+			}
+			else{
+				this._model.opacity = 0;
+			}
 
-					this._model.width = longestTextWidth + (this._model.xPadding * 2);
-
-
-					var halfHeight = this._model.height / 2;
-
-					//Check to ensure the height will fit on the canvas
-					if (this._model.y - halfHeight < 0) {
-						this._model.y = halfHeight;
-					} else if (this._model.y + halfHeight > this._chart.height) {
-						this._model.y = this._chart.height - halfHeight;
-					}
-
-					//Decide whether to align left or right based on position on canvas
-					if (this._model.x > this._chart.width / 2) {
-						this._model.x -= this._model.xOffset + this._model.width;
-					} else {
-						this._model.x += this._model.xOffset;
-					}
-					break;
+			if (changed && this._options.tooltips.custom) {
+				this._options.tooltips.custom.call(this, this._model);
 			}
 
 			return this;
 		},
 		draw: function() {
 
+
 			var ctx = this._chart.ctx;
 			var vm = this._view;
 
-			switch (this._options.hover.mode) {
-				case 'single':
-
-					ctx.font = helpers.fontString(vm.fontSize, vm._fontStyle, vm._fontFamily);
-
-					vm.xAlign = "center";
-					vm.yAlign = "above";
-
-					//Distance between the actual element.y position and the start of the tooltip caret
-					var caretPadding = vm.caretPadding || 2;
-
-					var tooltipWidth = ctx.measureText(vm.text).width + 2 * vm.xPadding,
-						tooltipRectHeight = vm.fontSize + 2 * vm.yPadding,
-						tooltipHeight = tooltipRectHeight + vm.caretHeight + caretPadding;
-
-					if (vm.x + tooltipWidth / 2 > this._chart.width) {
-						vm.xAlign = "left";
-					} else if (vm.x - tooltipWidth / 2 < 0) {
-						vm.xAlign = "right";
-					}
-
-					if (vm.y - tooltipHeight < 0) {
-						vm.yAlign = "below";
-					}
-
-					var tooltipX = vm.x - tooltipWidth / 2,
-						tooltipY = vm.y - tooltipHeight;
-
-					ctx.fillStyle = helpers.color(vm.backgroundColor).alpha(vm.opacity).rgbString();
-
-					// Custom Tooltips
-					if (this._options.tooltips.custom) {
-						this._options.tooltips.custom(this);
-					}
-					if (!this._options.tooltips.enabled) {
-						return;
-					}
-
-					switch (vm.yAlign) {
-						case "above":
-							//Draw a caret above the x/y
-							ctx.beginPath();
-							ctx.moveTo(vm.x, vm.y - caretPadding);
-							ctx.lineTo(vm.x + vm.caretHeight, vm.y - (caretPadding + vm.caretHeight));
-							ctx.lineTo(vm.x - vm.caretHeight, vm.y - (caretPadding + vm.caretHeight));
-							ctx.closePath();
-							ctx.fill();
-							break;
-						case "below":
-							tooltipY = vm.y + caretPadding + vm.caretHeight;
-							//Draw a caret below the x/y
-							ctx.beginPath();
-							ctx.moveTo(vm.x, vm.y + caretPadding);
-							ctx.lineTo(vm.x + vm.caretHeight, vm.y + caretPadding + vm.caretHeight);
-							ctx.lineTo(vm.x - vm.caretHeight, vm.y + caretPadding + vm.caretHeight);
-							ctx.closePath();
-							ctx.fill();
-							break;
-					}
-
-					switch (vm.xAlign) {
-						case "left":
-							tooltipX = vm.x - tooltipWidth + (vm.cornerRadius + vm.caretHeight);
-							break;
-						case "right":
-							tooltipX = vm.x - (vm.cornerRadius + vm.caretHeight);
-							break;
-					}
-
-					helpers.drawRoundedRectangle(ctx, tooltipX, tooltipY, tooltipWidth, tooltipRectHeight, vm.cornerRadius);
-
-					ctx.fill();
-
-					ctx.fillStyle = helpers.color(vm.textColor).alpha(vm.opacity).rgbString();
-					ctx.textAlign = "center";
-					ctx.textBaseline = "middle";
-					ctx.fillText(vm.text, tooltipX + tooltipWidth / 2, tooltipY + tooltipRectHeight / 2);
-					break;
-				case 'label':
-
-					// Custom Tooltips
-					if (this._options.tooltips.custom) {
-						this._options.tooltips.custom(this);
-					}
-					if (!this._options.tooltips.enabled) {
-						return;
-					}
-
-					helpers.drawRoundedRectangle(ctx, vm.x, vm.y - vm.height / 2, vm.width, vm.height, vm.cornerRadius);
-					ctx.fillStyle = helpers.color(vm.backgroundColor).alpha(vm.opacity).rgbString();
-					ctx.fill();
-					ctx.closePath();
-
-					ctx.textAlign = "left";
-					ctx.textBaseline = "middle";
-					ctx.fillStyle = helpers.color(vm.titleTextColor).alpha(vm.opacity).rgbString();
-					ctx.font = helpers.fontString(vm.fontSize, vm._titleFontStyle, vm._titleFontFamily);
-					ctx.fillText(vm.title, vm.x + vm.xPadding, this.getLineHeight(0));
-
-					ctx.font = helpers.fontString(vm.fontSize, vm._fontStyle, vm._fontFamily);
-					helpers.each(vm.labels, function(label, index) {
-						ctx.fillStyle = helpers.color(vm.textColor).alpha(vm.opacity).rgbString();
-						ctx.fillText(label, vm.x + vm.xPadding + vm.fontSize + 3, this.getLineHeight(index + 1));
-
-						//A bit gnarly, but clearing this rectangle breaks when using explorercanvas (clears whole canvas)
-						//ctx.clearRect(vm.x + vm.xPadding, this.getLineHeight(index + 1) - vm.fontSize/2, vm.fontSize, vm.fontSize);
-						//Instead we'll make a white filled block to put the legendColour palette over.
-
-						ctx.fillStyle = helpers.color(vm.legendColors[index].stroke).alpha(vm.opacity).rgbString();
-						ctx.fillRect(vm.x + vm.xPadding - 1, this.getLineHeight(index + 1) - vm.fontSize / 2 - 1, vm.fontSize + 2, vm.fontSize + 2);
-
-						ctx.fillStyle = helpers.color(vm.legendColors[index].fill).alpha(vm.opacity).rgbString();
-						ctx.fillRect(vm.x + vm.xPadding, this.getLineHeight(index + 1) - vm.fontSize / 2, vm.fontSize, vm.fontSize);
-
-
-					}, this);
-					break;
+			if (this._view.opacity === 0) {
+				return;
 			}
-		},
-		getLineHeight: function(index) {
-			var baseLineHeight = this._view.y - (this._view.height / 2) + this._view.yPadding,
-				afterTitleIndex = index - 1;
 
-			//If the index is zero, we're getting the title
-			if (index === 0) {
-				return baseLineHeight + this._view.titleFontSize / 2;
+			// Get Dimensions
+
+			vm.position = "top";
+
+			var caretPadding = vm.caretPadding || 2;
+
+			var combinedBodyLength = vm.body.length + vm.beforeBody.length + vm.afterBody.length;
+
+			// Height
+			var tooltipHeight = vm.yPadding * 2; // Tooltip Padding
+
+			tooltipHeight += vm.title.length * vm.titleFontSize; // Title Lines
+			tooltipHeight += (vm.title.length - 1) * vm.titleSpacing; // Title Line Spacing
+			tooltipHeight += vm.title.length ? vm.titleMarginBottom : 0; // Title's bottom Margin
+
+			tooltipHeight += combinedBodyLength * vm.bodyFontSize; // Body Lines
+			tooltipHeight += (combinedBodyLength - 1) * vm.bodySpacing; // Body Line Spacing
+
+			tooltipHeight += vm.footer.length ? vm.footerMarginTop : 0; // Footer Margin
+			tooltipHeight += vm.footer.length * (vm.footerFontSize); // Footer Lines
+			tooltipHeight += (vm.footer.length - 1) * vm.footerSpacing; // Footer Line Spacing
+
+			// Width
+			var tooltipWidth = 0;
+			helpers.each(vm.title, function(line, i) {
+				ctx.font = helpers.fontString(vm.titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
+				tooltipWidth = Math.max(tooltipWidth, ctx.measureText(line).width);
+			});
+			helpers.each(vm.body, function(line, i) {
+				ctx.font = helpers.fontString(vm.bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
+				tooltipWidth = Math.max(tooltipWidth, ctx.measureText(line).width + (this._options.tooltips.mode != 'single' ? (vm.bodyFontSize + 2) : 0));
+			}, this);
+			helpers.each(vm.footer, function(line, i) {
+				ctx.font = helpers.fontString(vm.footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
+				tooltipWidth = Math.max(tooltipWidth, ctx.measureText(line).width);
+			});
+			tooltipWidth += 2 * vm.xPadding;
+			var tooltipTotalWidth = tooltipWidth + vm.caretSize + caretPadding;
+
+
+
+			// Smart Tooltip placement to stay on the canvas
+			// Top, center, or bottom
+			vm.yAlign = "center";
+			if (vm.y - (tooltipHeight / 2) < 0) {
+				vm.yAlign = "top";
+			} else if (vm.y + (tooltipHeight / 2) > this._chart.height) {
+				vm.yAlign = "bottom";
+			}
+
+
+			// Left or Right
+			vm.xAlign = "right";
+			if (vm.x + tooltipTotalWidth > this._chart.width) {
+				vm.xAlign = "left";
+			}
+
+
+			// Background Position
+			var tooltipX = vm.x,
+				tooltipY = vm.y;
+
+			if (vm.yAlign == 'top') {
+				tooltipY = vm.y - vm.caretSize - vm.cornerRadius;
+			} else if (vm.yAlign == 'bottom') {
+				tooltipY = vm.y - tooltipHeight + vm.caretSize + vm.cornerRadius;
 			} else {
-				return baseLineHeight + ((this._view.fontSize * 1.5 * afterTitleIndex) + this._view.fontSize / 2) + this._view.titleFontSize * 1.5;
+				tooltipY = vm.y - (tooltipHeight / 2);
 			}
 
+			if (vm.xAlign == 'left') {
+				tooltipX = vm.x - tooltipTotalWidth;
+			} else if (vm.xAlign == 'right') {
+				tooltipX = vm.x + caretPadding + vm.caretSize;
+			} else {
+				tooltipX = vm.x + (tooltipTotalWidth / 2);
+			}
+
+			// Draw Background
+
+			// IE11/Edge does not like very small opacities, so snap to 0
+			var opacity = Math.abs(vm.opacity < 1e-3) ? 0 : vm.opacity;
+
+			if (this._options.tooltips.enabled) {
+				ctx.fillStyle = helpers.color(vm.backgroundColor).alpha(opacity).rgbString();
+				helpers.drawRoundedRectangle(ctx, tooltipX, tooltipY, tooltipWidth, tooltipHeight, vm.cornerRadius);
+				ctx.fill();
+			}
+
+
+			// Draw Caret
+			if (this._options.tooltips.enabled) {
+				ctx.fillStyle = helpers.color(vm.backgroundColor).alpha(opacity).rgbString();
+
+				if (vm.xAlign == 'left') {
+
+					ctx.beginPath();
+					ctx.moveTo(vm.x - caretPadding, vm.y);
+					ctx.lineTo(vm.x - caretPadding - vm.caretSize, vm.y - vm.caretSize);
+					ctx.lineTo(vm.x - caretPadding - vm.caretSize, vm.y + vm.caretSize);
+					ctx.closePath();
+					ctx.fill();
+				} else {
+					ctx.beginPath();
+					ctx.moveTo(vm.x + caretPadding, vm.y);
+					ctx.lineTo(vm.x + caretPadding + vm.caretSize, vm.y - vm.caretSize);
+					ctx.lineTo(vm.x + caretPadding + vm.caretSize, vm.y + vm.caretSize);
+					ctx.closePath();
+					ctx.fill();
+				}
+			}
+
+			// Draw Title, Body, and Footer
+
+			if (this._options.tooltips.enabled) {
+
+				var yBase = tooltipY + vm.yPadding;
+				var xBase = tooltipX + vm.xPadding;
+
+				// Titles
+
+				if (vm.title.length) {
+					ctx.textAlign = vm._titleAlign;
+					ctx.textBaseline = "top";
+					ctx.fillStyle = helpers.color(vm.titleColor).alpha(opacity).rgbString();
+					ctx.font = helpers.fontString(vm.titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
+
+					helpers.each(vm.title, function(title, i) {
+						ctx.fillText(title, xBase, yBase);
+						yBase += vm.titleFontSize + vm.titleSpacing; // Line Height and spacing
+						if (i + 1 == vm.title.length) {
+							yBase += vm.titleMarginBottom - vm.titleSpacing; // If Last, add margin, remove spacing
+						}
+					}, this);
+				}
+
+
+				// Body
+				ctx.textAlign = vm._bodyAlign;
+				ctx.textBaseline = "top";
+				ctx.fillStyle = helpers.color(vm.bodyColor).alpha(opacity).rgbString();
+				ctx.font = helpers.fontString(vm.bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
+
+				// Before Body
+				helpers.each(vm.beforeBody, function(beforeBody, i) {
+					ctx.fillText(vm.beforeBody, xBase, yBase);
+					yBase += vm.bodyFontSize + vm.bodySpacing;
+				});
+
+				helpers.each(vm.body, function(body, i) {
+
+
+					// Draw Legend-like boxes if needed
+					if (this._options.tooltips.mode != 'single') {
+						// Fill a white rect so that colours merge nicely if the opacity is < 1
+						ctx.fillStyle = helpers.color('#FFFFFF').alpha(opacity).rgbaString();
+						ctx.fillRect(xBase, yBase, vm.bodyFontSize, vm.bodyFontSize);
+
+						// Border
+						ctx.strokeStyle = helpers.color(vm.labelColors[i].borderColor).alpha(opacity).rgbaString();
+						ctx.strokeRect(xBase, yBase, vm.bodyFontSize, vm.bodyFontSize);
+
+						// Inner square
+						ctx.fillStyle = helpers.color(vm.labelColors[i].backgroundColor).alpha(opacity).rgbaString();
+						ctx.fillRect(xBase + 1, yBase + 1, vm.bodyFontSize - 2, vm.bodyFontSize - 2);
+
+						ctx.fillStyle = helpers.color(vm.bodyColor).alpha(opacity).rgbaString(); // Return fill style for text
+					}
+
+					// Body Line
+					ctx.fillText(body, xBase + (this._options.tooltips.mode != 'single' ? (vm.bodyFontSize + 2) : 0), yBase);
+
+					yBase += vm.bodyFontSize + vm.bodySpacing;
+
+				}, this);
+
+				// After Body
+				helpers.each(vm.afterBody, function(afterBody, i) {
+					ctx.fillText(vm.afterBody, xBase, yBase);
+					yBase += vm.bodyFontSize;
+				});
+
+				yBase -= vm.bodySpacing; // Remove last body spacing
+
+
+				// Footer
+				if (vm.footer.length) {
+
+					yBase += vm.footerMarginTop;
+
+					ctx.textAlign = vm._footerAlign;
+					ctx.textBaseline = "top";
+					ctx.fillStyle = helpers.color(vm.footerColor).alpha(opacity).rgbString();
+					ctx.font = helpers.fontString(vm.footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
+
+					helpers.each(vm.footer, function(footer, i) {
+						ctx.fillText(footer, xBase, yBase);
+						yBase += vm.footerFontSize + vm.footerSpacing;
+					}, this);
+				}
+
+			}
 		},
 	});
 

src/elements/element.arc.js

@@ -45,7 +45,7 @@
 
 				// Put into the range of (-PI/2, 3PI/2]
 				var startAngle = vm.startAngle < (-0.5 * Math.PI) ? vm.startAngle + (2.0 * Math.PI) : vm.startAngle > (1.5 * Math.PI) ? vm.startAngle - (2.0 * Math.PI) : vm.startAngle;
-				var endAngle = vm.endAngle < (-0.5 * Math.PI) ? vm.endAngle + (2.0 * Math.PI) : vm.endAngle > (1.5 * Math.PI) ? vm.endAngle - (2.0 * Math.PI) : vm.endAngle
+				var endAngle = vm.endAngle < (-0.5 * Math.PI) ? vm.endAngle + (2.0 * Math.PI) : vm.endAngle > (1.5 * Math.PI) ? vm.endAngle - (2.0 * Math.PI) : vm.endAngle;
 
 				//Check if within the range of the open/close angle
 				var betweenAngles = (pointRelativePosition.angle >= startAngle && pointRelativePosition.angle <= endAngle),

src/elements/element.line.js

@@ -27,67 +27,40 @@
 		borderDashOffset: 0.0,
 		borderJoinStyle: 'miter',
 		fill: true, // do we fill in the area between the line and its base axis
-		skipNull: true,
-		drawNull: false,
 	};
 
-
 	Chart.elements.Line = Chart.Element.extend({
+		lineToNextPoint: function(previousPoint, point, nextPoint, skipHandler, previousSkipHandler) {
+			var ctx = this._chart.ctx;
+
+			if (point._view.skip) {
+				skipHandler.call(this, previousPoint, point, nextPoint); 
+			} else if (previousPoint._view.skip) {
+				previousSkipHandler.call(this, previousPoint, point, nextPoint);
+			} else {
+				// Line between points
+				ctx.bezierCurveTo(
+					previousPoint._view.controlPointNextX, 
+					previousPoint._view.controlPointNextY,
+					point._view.controlPointPreviousX,
+					point._view.controlPointPreviousY,
+					point._view.x,
+					point._view.y
+				);
+			}
+		},
+
 		draw: function() {
+			var _this = this;
 
 			var vm = this._view;
 			var ctx = this._chart.ctx;
 			var first = this._children[0];
 			var last = this._children[this._children.length - 1];
 
-			ctx.save();
-
-			// Draw the background first (so the border is always on top)
-			helpers.each(this._children, function(point, index) {
-				var previous = helpers.previousItem(this._children, index);
-				var next = helpers.nextItem(this._children, index);
-
-				// First point only
-				if (index === 0) {
-					ctx.moveTo(point._view.x, point._view.y);
-					return;
-				}
-
-				// Start Skip and drag along scale baseline
-				if (point._view.skip && vm.skipNull && !this._loop) {
-					ctx.lineTo(previous._view.x, point._view.y);
-					ctx.moveTo(next._view.x, point._view.y);
-				}
-				// End Skip Stright line from the base line
-				else if (previous._view.skip && vm.skipNull && !this._loop) {
-					ctx.moveTo(point._view.x, previous._view.y);
-					ctx.lineTo(point._view.x, point._view.y);
-				}
-
-				if (previous._view.skip && vm.skipNull) {
-					ctx.moveTo(point._view.x, point._view.y);
-				}
-				// Normal Bezier Curve
-				else {
-					if (vm.tension > 0) {
-						ctx.bezierCurveTo(
-							previous._view.controlPointNextX,
-							previous._view.controlPointNextY,
-							point._view.controlPointPreviousX,
-							point._view.controlPointPreviousY,
-							point._view.x,
-							point._view.y
-						);
-					} else {
-						ctx.lineTo(point._view.x, point._view.y);
-					}
-				}
-			}, this);
-
-			// For radial scales, loop back around to the first point
-			if (this._loop) {
-				if (vm.tension > 0 && !first._view.skip) {
-
+			function loopBackToStart(drawLineToCenter) {
+				if (!first._view.skip && !last._view.skip) {
+					// Draw a bezier line from last to first
 					ctx.bezierCurveTo(
 						last._view.controlPointNextX,
 						last._view.controlPointNextY,
@@ -96,22 +69,68 @@
 						first._view.x,
 						first._view.y
 					);
-				} else {
-					ctx.lineTo(first._view.x, first._view.y);
+				} else if (drawLineToCenter) {
+					// Go to center
+					ctx.lineTo(_this._view.scaleZero.x, _this._view.scaleZero.y);
 				}
 			}
 
+			ctx.save();
+
 			// If we had points and want to fill this line, do so.
 			if (this._children.length > 0 && vm.fill) {
-				//Round off the line by going to the base of the chart, back to the start, then fill.
-				ctx.lineTo(this._children[this._children.length - 1]._view.x, vm.scaleZero);
-				ctx.lineTo(this._children[0]._view.x, vm.scaleZero);
+				// Draw the background first (so the border is always on top)
+				ctx.beginPath();
+
+				helpers.each(this._children, function(point, index) {
+					var previous = helpers.previousItem(this._children, index);
+					var next = helpers.nextItem(this._children, index);
+
+					// First point moves to it's starting position no matter what
+					if (index === 0) {
+						if (this._loop) {
+							ctx.moveTo(vm.scaleZero.x, vm.scaleZero.y);
+						} else {
+							ctx.moveTo(point._view.x, vm.scaleZero);
+						}
+
+						if (point._view.skip) {
+							if (!this._loop) {
+								ctx.moveTo(next._view.x, this._view.scaleZero);
+							}
+						} else {
+							ctx.lineTo(point._view.x, point._view.y);
+						}
+					} else {
+						this.lineToNextPoint(previous, point, next, function(previousPoint, point, nextPoint) {
+							if (this._loop) {
+								// Go to center
+								ctx.lineTo(this._view.scaleZero.x, this._view.scaleZero.y);
+							} else {
+								ctx.lineTo(previousPoint._view.x, this._view.scaleZero);
+								ctx.moveTo(nextPoint._view.x, this._view.scaleZero);
+							}
+						}, function(previousPoint, point, nextPoint) {
+							// If we skipped the last point, draw a line to ourselves so that the fill is nice
+							ctx.lineTo(point._view.x, point._view.y);
+						});
+					}
+				}, this);
+
+				// For radial scales, loop back around to the first point
+				if (this._loop) {
+					loopBackToStart(true);
+				} else {
+					//Round off the line by going to the base of the chart, back to the start, then fill.
+					ctx.lineTo(this._children[this._children.length - 1]._view.x, vm.scaleZero);
+					ctx.lineTo(this._children[0]._view.x, vm.scaleZero);
+				}
+
 				ctx.fillStyle = vm.backgroundColor || Chart.defaults.global.defaultColor;
 				ctx.closePath();
 				ctx.fill();
 			}
 
-
 			// Now draw the line between all the points with any borders
 			ctx.lineCap = vm.borderCapStyle || Chart.defaults.global.elements.line.borderCapStyle;
 
@@ -130,58 +149,20 @@
 				var previous = helpers.previousItem(this._children, index);
 				var next = helpers.nextItem(this._children, index);
 
-				// First point only
 				if (index === 0) {
 					ctx.moveTo(point._view.x, point._view.y);
-					return;
-				}
-
-				// Start Skip and drag along scale baseline
-				if (point._view.skip && vm.skipNull && !this._loop) {
-					ctx.moveTo(previous._view.x, point._view.y);
-					ctx.moveTo(next._view.x, point._view.y);
-					return;
-				}
-				// End Skip Stright line from the base line
-				if (previous._view.skip && vm.skipNull && !this._loop) {
-					ctx.moveTo(point._view.x, previous._view.y);
-					ctx.moveTo(point._view.x, point._view.y);
-					return;
-				}
-
-				if (previous._view.skip && vm.skipNull) {
-					ctx.moveTo(point._view.x, point._view.y);
-					return;
-				}
-				// Normal Bezier Curve
-				if (vm.tension > 0) {
-					ctx.bezierCurveTo(
-						previous._view.controlPointNextX,
-						previous._view.controlPointNextY,
-						point._view.controlPointPreviousX,
-						point._view.controlPointPreviousY,
-						point._view.x,
-						point._view.y
-					);
 				} else {
-					ctx.lineTo(point._view.x, point._view.y);
+					this.lineToNextPoint(previous, point, next, function(previousPoint, point, nextPoint) {
+						ctx.moveTo(nextPoint._view.x, nextPoint._view.y);
+					}, function(previousPoint, point, nextPoint) {
+						// If we skipped the last point, move up to our point preventing a line from being drawn
+						ctx.moveTo(point._view.x, point._view.y);
+					});
 				}
 			}, this);
 
-			if (this._loop && !first._view.skip) {
-				if (vm.tension > 0) {
-
-					ctx.bezierCurveTo(
-						last._view.controlPointNextX,
-						last._view.controlPointNextY,
-						first._view.controlPointPreviousX,
-						first._view.controlPointPreviousY,
-						first._view.x,
-						first._view.y
-					);
-				} else {
-					ctx.lineTo(first._view.x, first._view.y);
-				}
+			if (this._loop) {
+				loopBackToStart();
 			}
 
 			ctx.stroke();
@@ -189,4 +170,4 @@
 		},
 	});
 
-}).call(this);
+}).call(this);

src/scales/scale.category.js

@@ -12,32 +12,35 @@
 
     var DatasetScale = Chart.Scale.extend({
         buildTicks: function(index) {
-            this.ticks = this.data.labels;
+            this.ticks = this.chart.data.labels;
+        },
+
+        getLabelForIndex: function(index, datasetIndex) {
+            return this.ticks[index];
         },
 
         // Used to get data value locations.  Value can either be an index or a numerical value
         getPixelForValue: function(value, index, datasetIndex, includeOffset) {
-
             if (this.isHorizontal()) {
                 var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
-                var valueWidth = innerWidth / Math.max((this.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
-                var valueOffset = (valueWidth * index) + this.paddingLeft;
+                var valueWidth = innerWidth / Math.max((this.chart.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
+                var widthOffset = (valueWidth * index) + this.paddingLeft;
 
                 if (this.options.gridLines.offsetGridLines && includeOffset) {
-                    valueOffset += (valueWidth / 2);
+                    widthOffset += (valueWidth / 2);
                 }
 
-                return this.left + Math.round(valueOffset);
+                return this.left + Math.round(widthOffset);
             } else {
                 var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
-                var valueHeight = innerHeight / Math.max((this.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
-                var valueOffset = (valueHeight * index) + this.paddingTop;
+                var valueHeight = innerHeight / Math.max((this.chart.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
+                var heightOffset = (valueHeight * index) + this.paddingTop;
 
                 if (this.options.gridLines.offsetGridLines && includeOffset) {
-                    valueOffset += (valueHeight / 2);
+                    heightOffset += (valueHeight / 2);
                 }
 
-                return this.top + Math.round(valueOffset);
+                return this.top + Math.round(heightOffset);
             }
         },
     });

src/scales/scale.linear.js

@@ -7,6 +7,32 @@
 
 	var defaultConfig = {
 		position: "left",
+		ticks: {
+			callback: function(tickValue, index, ticks) {
+				var delta = ticks[1] - ticks[0];
+
+				// If we have a number like 2.5 as the delta, figure out how many decimal places we need
+				if (Math.abs(delta) > 1) {
+					if (tickValue !== Math.floor(tickValue)) {
+						// not an integer
+						delta = tickValue - Math.floor(tickValue);
+					}
+				}
+
+				var logDelta = helpers.log10(Math.abs(delta));
+				var tickString = '';
+
+				if (tickValue !== 0) {
+					var numDecimal = -1 * Math.floor(logDelta);
+					numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
+					tickString = tickValue.toFixed(numDecimal);
+				} else {
+					tickString = '0'; // never show decimal places for 0
+				}
+
+				return tickString;
+			}
+		}
 	};
 
 	var LinearScale = Chart.Scale.extend({
@@ -16,15 +42,28 @@
 			this.min = null;
 			this.max = null;
 
-			var positiveValues = [];
-			var negativeValues = [];
-
 			if (this.options.stacked) {
-				helpers.each(this.data.datasets, function(dataset) {
-					if (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id) {
+				var valuesPerType = {};
+
+				helpers.each(this.chart.data.datasets, function(dataset) {
+					if (valuesPerType[dataset.type] === undefined) {
+						valuesPerType[dataset.type] = {
+							positiveValues: [],
+							negativeValues: [],
+						};
+					}
+
+					// Store these per type
+					var positiveValues = valuesPerType[dataset.type].positiveValues;
+					var negativeValues = valuesPerType[dataset.type].negativeValues;
+
+					if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
 						helpers.each(dataset.data, function(rawValue, index) {
 
-							var value = this.getRightValue(rawValue);
+							var value = +this.getRightValue(rawValue);
+							if (isNaN(value)) {
+								return;
+							}
 
 							positiveValues[index] = positiveValues[index] || 0;
 							negativeValues[index] = negativeValues[index] || 0;
@@ -42,15 +81,22 @@
 					}
 				}, this);
 
-				var values = positiveValues.concat(negativeValues);
-				this.min = helpers.min(values);
-				this.max = helpers.max(values);
+				helpers.each(valuesPerType, function(valuesForType) {
+					var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
+					var minVal = helpers.min(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);
 
 			} else {
-				helpers.each(this.data.datasets, function(dataset) {
-					if (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id) {
+				helpers.each(this.chart.data.datasets, function(dataset) {
+					if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
 						helpers.each(dataset.data, function(rawValue, index) {
-							var value = this.getRightValue(rawValue);
+							var value = +this.getRightValue(rawValue);
+							if (isNaN(value)) {
+								return;
+							}
 
 							if (this.min === null) {
 								this.min = value;
@@ -68,12 +114,6 @@
 				}, this);
 			}
 
-			if (this.min === this.max) {
-				this.min--;
-				this.max++;
-			}
-
-
 			// Then calulate the ticks
 			this.ticks = [];
 
@@ -85,10 +125,12 @@
 			var maxTicks;
 
 			if (this.isHorizontal()) {
-				maxTicks = Math.min(11, Math.ceil(this.width / 50));
+				maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11,
+				                    Math.ceil(this.width / 50));
 			} else {
 				// The factor of 2 used to scale the font size has been experimentally determined.
-				maxTicks = Math.min(11, Math.ceil(this.height / (2 * this.options.ticks.fontSize)));
+				maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11,
+				                    Math.ceil(this.height / (2 * this.options.ticks.fontSize)));
 			}
 
 			// Make sure we always have at least 2 ticks 
@@ -114,14 +156,29 @@
 				}
 			}
 
+			if (this.options.ticks.suggestedMin) {
+				this.min = Math.min(this.min, this.options.ticks.suggestedMin);
+			}
+
+			if (this.options.ticks.suggestedMax) {
+				this.max = Math.max(this.max, this.options.ticks.suggestedMax);
+			}
+
+			if (this.min === this.max) {
+				this.min--;
+				this.max++;
+			}
+
 			var niceRange = helpers.niceNum(this.max - this.min, false);
 			var spacing = helpers.niceNum(niceRange / (maxTicks - 1), true);
 			var niceMin = Math.floor(this.min / spacing) * spacing;
 			var niceMax = Math.ceil(this.max / spacing) * spacing;
 
+			var numSpaces = Math.ceil((niceMax - niceMin) / spacing);
+
 			// Put the values into the ticks array
-			for (var j = niceMin; j <= niceMax; j += spacing) {
-				this.ticks.push(j);
+			for (var j = 0; j <= numSpaces; ++j) {
+				this.ticks.push(niceMin + (j * spacing));
 			}
 
 			if (this.options.position == "left" || this.options.position == "right") {
@@ -147,30 +204,29 @@
 			this.zeroLineIndex = this.ticks.indexOf(0);
 		},
 
+		getLabelForIndex: function(index, datasetIndex) {
+			return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
+		},
+
 		// Utils
 		getPixelForValue: function(value, index, datasetIndex, includeOffset) {
 			// This must be called after fit has been run so that 
 			//      this.left, this.top, this.right, and this.bottom have been defined
+			var rightValue = +this.getRightValue(value);
 			var pixel;
 			var range = this.end - this.start;
 
 			if (this.isHorizontal()) {
 
 				var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
-				pixel = this.left + (innerWidth / range * (this.getRightValue(value) - this.start));
+				pixel = this.left + (innerWidth / range * (rightValue - this.start));
 				return Math.round(pixel + this.paddingLeft);
 			} else {
 				var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
-				pixel = (this.bottom - this.paddingBottom) - (innerHeight / range * (this.getRightValue(value) - this.start));
+				pixel = (this.bottom - this.paddingBottom) - (innerHeight / range * (rightValue - this.start));
 				return Math.round(pixel);
 			}
 		},
-
-		// Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not
-		getRightValue: function(rawValue) {
-			return (typeof(rawValue) === "object" && rawValue !== null) ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
-		},
-
 	});
 	Chart.scaleService.registerScaleType("linear", LinearScale, defaultConfig);
 

src/scales/scale.logarithmic.js

@@ -10,7 +10,15 @@
 
 		// label settings
 		ticks: {
-			template: "<%var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));if (remain === 1 || remain === 2 || remain === 5) {%><%=value.toExponential()%><%} else {%><%= null %><%}%>",
+			callback: function(value) {
+				var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));
+
+				if (remain === 1 || remain === 2 || remain === 5) {
+					return value.toExponential();
+				} else {
+					return '';
+				}
+			}
 		}
 	};
 
@@ -22,14 +30,21 @@
 			this.min = null;
 			this.max = null;
 
-			var values = [];
-
 			if (this.options.stacked) {
-				helpers.each(this.data.datasets, function(dataset) {
-					if (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id) {
-						helpers.each(dataset.data, function(rawValue, index) {
+				var valuesPerType = {};
 
-							var value = this.getRightValue(rawValue);
+				helpers.each(this.chart.data.datasets, function(dataset) {
+					if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
+						if (valuesPerType[dataset.type] === undefined) {
+							valuesPerType[dataset.type] = [];
+						}
+
+						helpers.each(dataset.data, function(rawValue, index) {
+							var values = valuesPerType[dataset.type];
+							var value = +this.getRightValue(rawValue);
+							if (isNaN(value)) {
+								return;
+							}
 
 							values[index] = values[index] || 0;
 
@@ -43,14 +58,21 @@
 					}
 				}, this);
 
-				this.min = helpers.min(values);
-				this.max = helpers.max(values);
+				helpers.each(valuesPerType, function(valuesForType) {
+					var minVal = helpers.min(valuesForType);
+					var maxVal = helpers.max(valuesForType);
+					this.min = this.min === null ? minVal : Math.min(this.min, minVal);
+					this.max = this.max === null ? maxVal : Math.max(this.max, maxVal);
+				}, this);
 
 			} else {
-				helpers.each(this.data.datasets, function(dataset) {
-					if (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id) {
+				helpers.each(this.chart.data.datasets, function(dataset) {
+					if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
 						helpers.each(dataset.data, function(rawValue, index) {
-							var value = this.getRightValue(rawValue);
+							var value = +this.getRightValue(rawValue);
+							if (isNaN(value)) {
+								return;
+							}
 
 							if (this.min === null) {
 								this.min = value;
@@ -121,9 +143,9 @@
 
 			this.ticks = this.tickValues.slice();
 		},
-		// Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not
-		getRightValue: function(rawValue) {
-			return typeof rawValue === "object" ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
+		// Get the correct tooltip label
+		getLabelForIndex: function(index, datasetIndex) {
+			return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
 		},
 		getPixelForTick: function(index, includeOffset) {
 			return this.getPixelForValue(this.tickValues[index], null, null, includeOffset);
@@ -131,7 +153,7 @@
 		getPixelForValue: function(value, index, datasetIndex, includeOffset) {
 			var pixel;
 
-			var newVal = this.getRightValue(value);
+			var newVal = +this.getRightValue(value);
 			var range = helpers.log10(this.end) - helpers.log10(this.start);
 
 			if (this.isHorizontal()) {

src/scales/scale.radialLinear.js

@@ -14,7 +14,7 @@
 		position: "chartArea",
 
 		angleLines: {
-			show: true,
+			display: true,
 			color: "rgba(0, 0, 0, 0.1)",
 			lineWidth: 1
 		},
@@ -51,7 +51,7 @@
 
 	var LinearRadialScale = Chart.Scale.extend({
 		getValueCount: function() {
-			return this.data.labels.length;
+			return this.chart.data.labels.length;
 		},
 		setDimensions: function() {
 			// Set the unconstrained dimension before label rotation
@@ -59,7 +59,7 @@
 			this.height = this.maxHeight;
 			this.xCenter = Math.round(this.width / 2);
 			this.yCenter = Math.round(this.height / 2);
-			
+
 			var minSize = helpers.min([this.height, this.width]);
 			this.drawingArea = (this.options.display) ? (minSize / 2) - (this.options.ticks.fontSize / 2 + this.options.ticks.backdropPaddingY) : (minSize / 2);
 		},
@@ -67,22 +67,27 @@
 			this.min = null;
 			this.max = null;
 
-			helpers.each(this.data.datasets, function(dataset) {
-				helpers.each(dataset.data, function(value, index) {
-					if (value === null) return;
+			helpers.each(this.chart.data.datasets, function(dataset) {
+				if (helpers.isDatasetVisible(dataset)) {
+					helpers.each(dataset.data, function(rawValue, index) {
+						var value = +this.getRightValue(rawValue);
+						if (isNaN(value)) {
+							return;
+						}
 
-					if (this.min === null) {
-						this.min = value;
-					} else if (value < this.min) {
-						this.min = value;
-					}
+						if (this.min === null) {
+							this.min = value;
+						} else if (value < this.min) {
+							this.min = value;
+						}
 
-					if (this.max === null) {
-						this.max = value;
-					} else if (value > this.max) {
-						this.max = value;
-					}
-				}, this);
+						if (this.max === null) {
+							this.max = value;
+						} else if (value > this.max) {
+							this.max = value;
+						}
+					}, this);
+				}
 			}, this);
 
 			if (this.min === this.max) {
@@ -96,7 +101,8 @@
 			// the axis area. For now, we say that the minimum tick spacing in pixels must be 50
 			// We also limit the maximum number of ticks to 11 which gives a nice 10 squares on 
 			// the graph
-			var maxTicks = Math.min(11, Math.ceil(this.drawingArea / (1.5 * this.options.ticks.fontSize)));
+			var maxTicks = Math.min(this.options.ticks.maxTicksLimit ? this.options.ticks.maxTicksLimit : 11,
+			                        Math.ceil(this.drawingArea / (1.5 * this.options.ticks.fontSize)));
 			maxTicks = Math.max(2, maxTicks); // Make sure we always have at least 2 ticks 
 
 			// To get a "nice" value for the tick spacing, we will use the appropriately named 
@@ -146,6 +152,9 @@
 
 			this.zeroLineIndex = this.ticks.indexOf(0);
 		},
+		getLabelForIndex: function(index, datasetIndex) {
+			return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
+		},
 		getCircumference: function() {
 			return ((Math.PI * 2) / this.getValueCount());
 		},
@@ -201,9 +210,7 @@
 			for (i = 0; i < this.getValueCount(); i++) {
 				// 5px to space the text slightly out - similar to what we do in the draw function.
 				pointPosition = this.getPointPosition(i, largestPossibleRadius);
-				textWidth = this.ctx.measureText(helpers.template(this.options.ticks.template, {
-					value: this.data.labels[i]
-				})).width + 5;
+				textWidth = this.ctx.measureText(this.options.ticks.callback(this.chart.data.labels[i])).width + 5;
 				if (i === 0 || i === this.getValueCount() / 2) {
 					// If we're at index zero, or exactly the middle, we're at exactly the top/bottom
 					// of the radar chart, so text will be aligned centrally, so we'll half it and compare
@@ -265,7 +272,10 @@
 			return index * angleMultiplier - (Math.PI / 2);
 		},
 		getDistanceFromCenterForValue: function(value) {
-			if (value === null) return 0; // null always in center
+			if (value === null) {
+				return 0; // null always in center	
+			} 
+			
 			// Take into account half font size + the yPadding of the top value
 			var scalingFactor = this.drawingArea / (this.max - this.min);
 			if (this.options.reverse) {
@@ -277,8 +287,8 @@
 		getPointPosition: function(index, distanceFromCenter) {
 			var thisAngle = this.getIndexAngle(index);
 			return {
-				x: (Math.cos(thisAngle) * distanceFromCenter) + this.xCenter,
-				y: (Math.sin(thisAngle) * distanceFromCenter) + this.yCenter
+				x: Math.round(Math.cos(thisAngle) * distanceFromCenter) + this.xCenter,
+				y: Math.round(Math.sin(thisAngle) * distanceFromCenter) + this.yCenter
 			};
 		},
 		getPointPositionForValue: function(index, value) {
@@ -294,7 +304,7 @@
 						var yHeight = this.yCenter - yCenterOffset;
 
 						// Draw circular lines around the scale
-						if (this.options.gridLines.show) {
+						if (this.options.gridLines.display) {
 							ctx.strokeStyle = this.options.gridLines.color;
 							ctx.lineWidth = this.options.gridLines.lineWidth;
 
@@ -320,7 +330,7 @@
 							}
 						}
 
-						if (this.options.ticks.show) {
+						if (this.options.ticks.display) {
 							ctx.font = helpers.fontString(this.options.ticks.fontSize, this.options.ticks.fontStyle, this.options.ticks.fontFamily);
 
 							if (this.options.ticks.showLabelBackdrop) {
@@ -347,7 +357,7 @@
 					ctx.strokeStyle = this.options.angleLines.color;
 
 					for (var i = this.getValueCount() - 1; i >= 0; i--) {
-						if (this.options.angleLines.show) {
+						if (this.options.angleLines.display) {
 							var outerPosition = this.getPointPosition(i, this.getDistanceFromCenterForValue(this.options.reverse ? this.min : this.max));
 							ctx.beginPath();
 							ctx.moveTo(this.xCenter, this.yCenter);
@@ -360,8 +370,8 @@
 						ctx.font = helpers.fontString(this.options.pointLabels.fontSize, this.options.pointLabels.fontStyle, this.options.pointLabels.fontFamily);
 						ctx.fillStyle = this.options.pointLabels.fontColor;
 
-						var labelsCount = this.data.labels.length,
-							halfLabelsCount = this.data.labels.length / 2,
+						var labelsCount = this.chart.data.labels.length,
+							halfLabelsCount = this.chart.data.labels.length / 2,
 							quarterLabelsCount = halfLabelsCount / 2,
 							upperHalf = (i < quarterLabelsCount || i > labelsCount - quarterLabelsCount),
 							exactQuarter = (i === quarterLabelsCount || i === labelsCount - quarterLabelsCount);
@@ -384,7 +394,7 @@
 							ctx.textBaseline = 'top';
 						}
 
-						ctx.fillText(this.data.labels[i], pointLabelPosition.x, pointLabelPosition.y);
+						ctx.fillText(this.chart.data.labels[i], pointLabelPosition.x, pointLabelPosition.y);
 					}
 				}
 			}

src/scales/scale.time.js

@@ -22,44 +22,6 @@
 			'quarter',
 			'year',
 		],
-		unit: {
-			'millisecond': {
-				display: 'SSS [ms]', // 002 ms
-				maxStep: 1000,
-			},
-			'second': {
-				display: 'h:mm:ss a', // 11:20:01 AM
-				maxStep: 60,
-			},
-			'minute': {
-				display: 'h:mm:ss a', // 11:20:01 AM
-				maxStep: 60,
-			},
-			'hour': {
-				display: 'MMM D, hA', // Sept 4, 5PM
-				maxStep: 24,
-			},
-			'day': {
-				display: 'll', // Sep 4 2015
-				maxStep: 7,
-			},
-			'week': {
-				display: 'll', // Week 46, or maybe "[W]WW - YYYY" ?
-				maxStep: 4.3333,
-			},
-			'month': {
-				display: 'MMM YYYY', // Sept 2015
-				maxStep: 12,
-			},
-			'quarter': {
-				display: '[Q]Q - YYYY', // Q3
-				maxStep: 4,
-			},
-			'year': {
-				display: 'YYYY', // 2015
-				maxStep: false,
-			},
-		}
 	};
 
 	var defaultConfig = {
@@ -69,33 +31,96 @@
 			format: false, // false == date objects or use pattern string from http://momentjs.com/docs/#/parsing/string-format/
 			unit: false, // false == automatic or override with week, month, year, etc.
 			round: false, // none, or override with week, month, year, etc.
-			displayFormat: false, // defaults to unit's corresponding unitFormat below or override using pattern string from http://momentjs.com/docs/#/displaying/format/
+			displayFormat: false, // DEPRECATED
+
+			// defaults to unit's corresponding unitFormat below or override using pattern string from http://momentjs.com/docs/#/displaying/format/
+			displayFormats: {
+				'millisecond': 'SSS [ms]',
+				'second': 'h:mm:ss a', // 11:20:01 AM
+				'minute': 'h:mm:ss a', // 11:20:01 AM
+				'hour': 'MMM D, hA', // Sept 4, 5PM
+				'day': 'll', // Sep 4 2015
+				'week': 'll', // Week 46, or maybe "[W]WW - YYYY" ?
+				'month': 'MMM YYYY', // Sept 2015
+				'quarter': '[Q]Q - YYYY', // Q3
+				'year': 'YYYY', // 2015
+			}, 
 		},
 	};
 
 	var TimeScale = Chart.Scale.extend({
+		getLabelMoment: function(datasetIndex, index) {
+			return this.labelMoments[datasetIndex][index];
+		},
+
+		buildLabelMoments: function() {
+			// Only parse these once. If the dataset does not have data as x,y pairs, we will use
+			// these 
+			var scaleLabelMoments = [];
+			if (this.chart.data.labels && this.chart.data.labels.length > 0) {
+				helpers.each(this.chart.data.labels, function(label, index) {
+					var labelMoment = this.parseTime(label);
+					if (this.options.time.round) {
+						labelMoment.startOf(this.options.time.round);
+					}
+					scaleLabelMoments.push(labelMoment);
+				}, this);
+
+				if (this.options.time.min) {
+					this.firstTick = this.parseTime(this.options.time.min);
+				} else {
+					this.firstTick = moment.min.call(this, scaleLabelMoments);
+				}
+
+				if (this.options.time.max) {
+					this.lastTick = this.parseTime(this.options.time.max);
+				} else {
+					this.lastTick = moment.max.call(this, scaleLabelMoments);
+				}
+			} else {
+				this.firstTick = null;
+				this.lastTick = null;
+			}
+
+			helpers.each(this.chart.data.datasets, function(dataset, datasetIndex) {
+				var momentsForDataset = [];
+
+				if (typeof dataset.data[0] === 'object') {
+					helpers.each(dataset.data, function(value, index) {
+						var labelMoment = this.parseTime(this.getRightValue(value));
+						if (this.options.time.round) {
+							labelMoment.startOf(this.options.time.round);
+						}
+						momentsForDataset.push(labelMoment);
+
+						// May have gone outside the scale ranges, make sure we keep the first and last ticks updated
+						this.firstTick = this.firstTick !== null ? moment.min(this.firstTick, labelMoment) : labelMoment;
+						this.lastTick = this.lastTick !== null ? moment.max(this.lastTick, labelMoment) : labelMoment;
+					}, this);
+				} else {
+					// We have no labels. Use the ones from the scale
+					momentsForDataset = scaleLabelMoments;
+				}
+
+				this.labelMoments.push(momentsForDataset);
+			}, this);
+
+			// We will modify these, so clone for later
+			this.firstTick = this.firstTick.clone();
+			this.lastTick = this.lastTick.clone();
+		},
+
 		buildTicks: function(index) {
 
 			this.ticks = [];
 			this.labelMoments = [];
 
-			// Parse each label into a moment
-			this.data.labels.forEach(function(label, index) {
-				var labelMoment = this.parseTime(label);
-				if (this.options.time.round) {
-					labelMoment.startOf(this.options.time.round);
-				}
-				this.labelMoments.push(labelMoment);
-			}, this);
-
-			// Find the first and last moments, and range
-			this.firstTick = moment.min.call(this, this.labelMoments).clone();
-			this.lastTick = moment.max.call(this, this.labelMoments).clone();
+			this.buildLabelMoments();
 
 			// Set unit override if applicable
 			if (this.options.time.unit) {
 				this.tickUnit = this.options.time.unit || 'day';
-				this.displayFormat = time.unit[this.tickUnit].display;
+				this.displayFormat = this.options.time.displayFormats[this.tickUnit];
 				this.tickRange = Math.ceil(this.lastTick.diff(this.firstTick, this.tickUnit, true));
 			} else {
 				// Determine the smallest needed unit of the time
@@ -106,7 +131,7 @@
 				// Start as small as possible
 				this.tickUnit = 'millisecond';
 				this.tickRange = Math.ceil(this.lastTick.diff(this.firstTick, this.tickUnit, true) + buffer);
-				this.displayFormat = time.unit[this.tickUnit].display;
+				this.displayFormat = this.options.time.displayFormats[this.tickUnit];
 
 				// Work our way up to comfort
 				helpers.each(time.units, function(format) {
@@ -115,7 +140,7 @@
 					}
 					this.tickUnit = format;
 					this.tickRange = Math.ceil(this.lastTick.diff(this.firstTick, this.tickUnit) + buffer);
-					this.displayFormat = time.unit[format].display;
+					this.displayFormat = this.options.time.displayFormats[format];
 
 				}, this);
 			}
@@ -124,11 +149,11 @@
 			this.lastTick.endOf(this.tickUnit);
 			this.smallestLabelSeparation = this.width;
 
-			var i = 0;
-
-			for (i = 1; i < this.labelMoments.length; i++) {
-				this.smallestLabelSeparation = Math.min(this.smallestLabelSeparation, this.labelMoments[i].diff(this.labelMoments[i - 1], this.tickUnit, true));
-			}
+			helpers.each(this.chart.data.datasets, function(dataset, datasetIndex) {
+				for (var i = 1; i < this.labelMoments[datasetIndex].length; i++) {
+					this.smallestLabelSeparation = Math.min(this.smallestLabelSeparation, this.labelMoments[datasetIndex][i].diff(this.labelMoments[datasetIndex][i - 1], this.tickUnit, true));
+				}
+			}, this);
 
 			// Tick displayFormat override
 			if (this.options.time.displayFormat) {
@@ -136,13 +161,23 @@
 			}
 
 			// For every unit in between the first and last moment, create a moment and add it to the ticks tick
-			for (i = 0; i <= this.tickRange; ++i) {
+			for (var i = 0; i <= this.tickRange; ++i) {
 				this.ticks.push(this.firstTick.clone().add(i, this.tickUnit));
 			}
 		},
+		// Get tooltip label
+		getLabelForIndex: function(index, datasetIndex) {
+			var label = this.chart.data.labels && index < this.chart.data.labels.length ? this.chart.data.labels[index] : '';
+
+			if (typeof this.chart.data.datasets[datasetIndex].data[0] === 'object') {
+				label = this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
+			}
+
+			return label;
+		},
 		convertTicksToLabels: function() {
 			this.ticks = this.ticks.map(function(tick, index, ticks) {
-				var formattedTick = tick.format(this.options.time.displayFormat ? this.options.time.displayFormat : time.unit[this.tickUnit].display);
+				var formattedTick = tick.format(this.options.time.displayFormat ? this.options.time.displayFormat : this.options.time.displayFormats[this.tickUnit]);
 
 				if (this.options.ticks.userCallback) {
 					return this.options.ticks.userCallback(formattedTick, index, ticks);
@@ -152,8 +187,8 @@
 			}, this);
 		},
 		getPixelForValue: function(value, index, datasetIndex, includeOffset) {
-
-			var offset = this.labelMoments[index].diff(this.firstTick, this.tickUnit, true);
+			var labelMoment = this.getLabelMoment(datasetIndex, index);
+			var offset = labelMoment.diff(this.firstTick, this.tickUnit, true);
 
 			var decimal = offset / this.tickRange;
 

test/controller.bar.tests.js

@@ -78,6 +78,39 @@ describe('Bar controller tests', function() {
 		expect(controller.getBarCount()).toBe(2);
 	});
 
+	it('should correctly get the bar index accounting for hidden datasets', function() {
+		var chart = {
+			data: {
+				datasets: [{
+					
+				}, {
+					hidden: true
+				}, {
+					type: 'line'
+				}, {
+					
+				}]
+			},
+			config: {
+				type: 'bar'
+			},
+			options: {
+				scales: {
+					xAxes: [{
+						id: 'firstXScaleID'
+					}],
+					yAxes: [{
+						id: 'firstYScaleID'
+					}]
+				}
+			}
+		};
+
+		var controller = new Chart.controllers.bar(chart, 1);
+		expect(controller.getBarIndex(0)).toBe(0);
+		expect(controller.getBarIndex(3)).toBe(1);
+	});
+
 	it('Should create rectangle elements for each data item during initialization', function() {
 		var chart = {
 			data: {
@@ -157,7 +190,9 @@ describe('Bar controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -174,7 +209,9 @@ describe('Bar controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -229,13 +266,13 @@ describe('Bar controller tests', function() {
 		expect(bar1._xScale).toBe(chart.scales.firstXScaleID);
 		expect(bar1._yScale).toBe(chart.scales.firstYScaleID);
 		expect(bar1._model).toEqual({
-			x: 106.80000000000003,
+			x: 113.60000000000001,
 			y: 194,
 			label: 'label1',
 			datasetLabel: 'dataset2',
 
 			base: 194,
-			width: 12.240000000000002,
+			width: 13.680000000000001,
 			backgroundColor: 'rgb(255, 0, 0)',
 			borderColor: 'rgb(0, 0, 255)',
 			borderWidth: 2,
@@ -246,13 +283,13 @@ describe('Bar controller tests', function() {
 		expect(bar2._xScale).toBe(chart.scales.firstXScaleID);
 		expect(bar2._yScale).toBe(chart.scales.firstYScaleID);
 		expect(bar2._model).toEqual({
-			x: 140.8,
-			y: -15,
+			x: 151.60000000000002,
+			y: 6,
 			label: 'label2',
 			datasetLabel: 'dataset2',
 
 			base: 194,
-			width: 12.240000000000002,
+			width: 13.680000000000001,
 			backgroundColor: 'rgb(255, 0, 0)',
 			borderColor: 'rgb(0, 0, 255)',
 			borderWidth: 2,
@@ -283,7 +320,9 @@ describe('Bar controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -300,7 +339,9 @@ describe('Bar controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -366,7 +407,9 @@ describe('Bar controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -383,7 +426,9 @@ describe('Bar controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -486,7 +531,9 @@ describe('Bar controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -503,7 +550,9 @@ describe('Bar controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 

test/controller.doughnut.tests.js

@@ -68,6 +68,8 @@ describe('Doughnut controller tests', function() {
 			},
 			data: {
 				datasets: [{
+					hidden: true
+				}, {
 					data: [10, 15, 0, 4]
 				}, {
 					data: [1]
@@ -94,10 +96,10 @@ describe('Doughnut controller tests', function() {
 			}
 		};
 
-		var controller = new Chart.controllers.doughnut(chart, 0);
+		var controller = new Chart.controllers.doughnut(chart, 1);
 		controller.reset(); // reset first
 
-		expect(chart.data.datasets[0].metaData[0]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[0]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: Math.PI * -0.5,
@@ -106,7 +108,7 @@ describe('Doughnut controller tests', function() {
 			innerRadius: 36.75,
 		});
 
-		expect(chart.data.datasets[0].metaData[1]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[1]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: Math.PI * -0.5,
@@ -115,7 +117,7 @@ describe('Doughnut controller tests', function() {
 			innerRadius: 36.75,
 		});
 
-		expect(chart.data.datasets[0].metaData[2]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[2]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: Math.PI * -0.5,
@@ -124,7 +126,7 @@ describe('Doughnut controller tests', function() {
 			innerRadius: 36.75,
 		});
 
-		expect(chart.data.datasets[0].metaData[3]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[3]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: Math.PI * -0.5,
@@ -135,7 +137,7 @@ describe('Doughnut controller tests', function() {
 
 		controller.update();
 
-		expect(chart.data.datasets[0].metaData[0]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[0]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: Math.PI * -0.5,
@@ -152,7 +154,7 @@ describe('Doughnut controller tests', function() {
 			label: 'label0',
 		});
 
-		expect(chart.data.datasets[0].metaData[1]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[1]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: 0.5958182130626666,
@@ -169,7 +171,7 @@ describe('Doughnut controller tests', function() {
 			label: 'label1'
 		});
 
-		expect(chart.data.datasets[0].metaData[2]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[2]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: 3.8457400228490113,
@@ -186,7 +188,7 @@ describe('Doughnut controller tests', function() {
 			label: 'label2'
 		});
 
-		expect(chart.data.datasets[0].metaData[3]._model).toEqual({
+		expect(chart.data.datasets[1].metaData[3]._model).toEqual({
 			x: 50,
 			y: 100,
 			startAngle: 3.8457400228490113,
@@ -204,24 +206,24 @@ describe('Doughnut controller tests', function() {
 		});
 
 		// Change the amount of data and ensure that arcs are updated accordingly
-		chart.data.datasets[0].data = [1, 2]; // remove 2 elements from dataset 0
+		chart.data.datasets[1].data = [1, 2]; // remove 2 elements from dataset 0
 		controller.buildOrUpdateElements();
 		controller.update();
 
-		expect(chart.data.datasets[0].metaData.length).toBe(2);
-		expect(chart.data.datasets[0].metaData[0] instanceof Chart.elements.Arc).toBe(true);
-		expect(chart.data.datasets[0].metaData[1] instanceof Chart.elements.Arc).toBe(true);
+		expect(chart.data.datasets[1].metaData.length).toBe(2);
+		expect(chart.data.datasets[1].metaData[0] instanceof Chart.elements.Arc).toBe(true);
+		expect(chart.data.datasets[1].metaData[1] instanceof Chart.elements.Arc).toBe(true);
 
 		// Add data
-		chart.data.datasets[0].data = [1, 2, 3, 4];
+		chart.data.datasets[1].data = [1, 2, 3, 4];
 		controller.buildOrUpdateElements();
 		controller.update();
 
-		expect(chart.data.datasets[0].metaData.length).toBe(4);
-		expect(chart.data.datasets[0].metaData[0] instanceof Chart.elements.Arc).toBe(true);
-		expect(chart.data.datasets[0].metaData[1] instanceof Chart.elements.Arc).toBe(true);
-		expect(chart.data.datasets[0].metaData[2] instanceof Chart.elements.Arc).toBe(true);
-		expect(chart.data.datasets[0].metaData[3] instanceof Chart.elements.Arc).toBe(true);
+		expect(chart.data.datasets[1].metaData.length).toBe(4);
+		expect(chart.data.datasets[1].metaData[0] instanceof Chart.elements.Arc).toBe(true);
+		expect(chart.data.datasets[1].metaData[1] instanceof Chart.elements.Arc).toBe(true);
+		expect(chart.data.datasets[1].metaData[2] instanceof Chart.elements.Arc).toBe(true);
+		expect(chart.data.datasets[1].metaData[3] instanceof Chart.elements.Arc).toBe(true);
 	});
 
 	it ('should draw all arcs', function() {

test/controller.line.tests.js

@@ -103,7 +103,7 @@ describe('Line controller tests', function() {
 		expect(chart.data.datasets[0].metaData.length).toBe(3);
 	});
 
-	it ('should draw all elements', function() {
+	it('should draw all elements', function() {
 		var chart = {
 			data: {
 				datasets: [{
@@ -141,7 +141,7 @@ describe('Line controller tests', function() {
 		expect(chart.data.datasets[0].metaData[3].draw.calls.count()).toBe(1);
 	});
 
-	it ('should update elements', function() {
+	it('should update elements', function() {
 		var data = {
 			datasets: [{
 				data: [10, 15, 0, -4],
@@ -159,7 +159,9 @@ describe('Line controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -176,7 +178,9 @@ describe('Line controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -192,7 +196,7 @@ describe('Line controller tests', function() {
 			chartArea: {
 				bottom: 200,
 				left: xScale.left,
-				right: 200,
+				right: xScale.left + 200,
 				top: 0
 			},
 			data: data,
@@ -210,7 +214,6 @@ describe('Line controller tests', function() {
 						borderJoinStyle: 'bevel',
 						borderWidth: 1.2,
 						fill: true,
-						skipNull: true,
 						tension: 0.1,
 					},
 					point: {
@@ -251,8 +254,6 @@ describe('Line controller tests', function() {
 			borderJoinStyle: 'bevel',
 			borderWidth: 1.2,
 			fill: true,
-			drawNull: undefined,
-			skipNull: true,
 			tension: 0.1,
 
 			scaleTop: 0,
@@ -268,15 +269,15 @@ describe('Line controller tests', function() {
 			radius: 3,
 			skip: false,
 			tension: 0.1,
-			
+
 			// Point
-			x: 63,
+			x: 81,
 			y: 62,
 
 			// Control points
-			controlPointPreviousX: 63,
+			controlPointPreviousX: 81,
 			controlPointPreviousY: 62,
-			controlPointNextX: 67.5,
+			controlPointNextX: 86,
 			controlPointNextY: 57.3,
 		});
 
@@ -288,16 +289,16 @@ describe('Line controller tests', function() {
 			radius: 3,
 			skip: false,
 			tension: 0.1,
-			
+
 			// Point
-			x: 108,
+			x: 131,
 			y: 15,
 
 			// Control points
-			controlPointPreviousX: 105.27827106822767,
-			controlPointPreviousY: 12.125364948465183,
-			controlPointNextX: 114.17827106822767,
-			controlPointNextY: 21.52536494846518,
+			controlPointPreviousX: 127.82889384189087,
+			controlPointPreviousY: 12.04867347661131,
+			controlPointNextX: 137.92889384189088,
+			controlPointNextY: 21.44867347661131,
 		});
 
 		expect(chart.data.datasets[0].metaData[2]._model).toEqual({
@@ -308,16 +309,16 @@ describe('Line controller tests', function() {
 			radius: 3,
 			skip: false,
 			tension: 0.1,
-			
+
 			// Point
-			x: 152,
+			x: 182,
 			y: 156,
 
 			// Control points
-			controlPointPreviousX: 145.63719249781943,
-			controlPointPreviousY: 143.20289277651324,
-			controlPointNextX: 154.53719249781943,
-			controlPointNextY: 161.10289277651324,
+			controlPointPreviousX: 174.8815225337256,
+			controlPointPreviousY: 143.38408449046415,
+			controlPointNextX: 184.98152253372558,
+			controlPointNextY: 161.28408449046415,
 		});
 
 		expect(chart.data.datasets[0].metaData[3]._model).toEqual({
@@ -328,15 +329,15 @@ describe('Line controller tests', function() {
 			radius: 3,
 			skip: false,
 			tension: 0.1,
-			
+
 			// Point
-			x: 197,
+			x: 232,
 			y: 194,
 
 			// Control points
-			controlPointPreviousX: 192.5,
+			controlPointPreviousX: 227,
 			controlPointPreviousY: 190.2,
-			controlPointNextX: 197,
+			controlPointNextX: 232,
 			controlPointNextY: 194,
 		});
 
@@ -350,8 +351,6 @@ describe('Line controller tests', function() {
 		chart.data.datasets[0].borderDashOffset = 7;
 		chart.data.datasets[0].borderJoinStyle = 'miter';
 		chart.data.datasets[0].fill = false;
-		chart.data.datasets[0].skipNull = false;
-		chart.data.datasets[0].drawNull = true;
 
 		// point styles
 		chart.data.datasets[0].radius = 22;
@@ -371,8 +370,6 @@ describe('Line controller tests', function() {
 			borderJoinStyle: 'miter',
 			borderWidth: 0.55,
 			fill: false,
-			drawNull: true,
-			skipNull: false,
 			tension: 0.2,
 
 			scaleTop: 0,
@@ -388,15 +385,15 @@ describe('Line controller tests', function() {
 			radius: 22,
 			skip: false,
 			tension: 0.2,
-			
+
 			// Point
-			x: 63,
+			x: 81,
 			y: 62,
 
 			// Control points
-			controlPointPreviousX: 63,
+			controlPointPreviousX: 81,
 			controlPointPreviousY: 62,
-			controlPointNextX: 72,
+			controlPointNextX: 91,
 			controlPointNextY: 52.6,
 		});
 
@@ -408,16 +405,16 @@ describe('Line controller tests', function() {
 			radius: 22,
 			skip: false,
 			tension: 0.2,
-			
+
 			// Point
-			x: 108,
+			x: 131,
 			y: 15,
 
 			// Control points
-			controlPointPreviousX: 102.55654213645535,
-			controlPointPreviousY: 9.250729896930364,
-			controlPointNextX: 120.35654213645535,
-			controlPointNextY: 28.050729896930367,
+			controlPointPreviousX: 124.65778768378175,
+			controlPointPreviousY: 9.097346953222619,
+			controlPointNextX: 144.85778768378177,
+			controlPointNextY: 27.897346953222623,
 		});
 
 		expect(chart.data.datasets[0].metaData[2]._model).toEqual({
@@ -428,16 +425,16 @@ describe('Line controller tests', function() {
 			radius: 22,
 			skip: false,
 			tension: 0.2,
-			
+
 			// Point
-			x: 152,
+			x: 182,
 			y: 156,
 
 			// Control points
-			controlPointPreviousX: 139.27438499563885,
-			controlPointPreviousY: 130.40578555302648,
-			controlPointNextX: 157.07438499563887,
-			controlPointNextY: 166.20578555302646,
+			controlPointPreviousX: 167.76304506745115,
+			controlPointPreviousY: 130.76816898092827,
+			controlPointNextX: 187.96304506745116,
+			controlPointNextY: 166.56816898092828,
 		});
 
 		expect(chart.data.datasets[0].metaData[3]._model).toEqual({
@@ -448,15 +445,15 @@ describe('Line controller tests', function() {
 			radius: 22,
 			skip: false,
 			tension: 0.2,
-			
+
 			// Point
-			x: 197,
+			x: 232,
 			y: 194,
 
 			// Control points
-			controlPointPreviousX: 188,
+			controlPointPreviousX: 222,
 			controlPointPreviousY: 186.4,
-			controlPointNextX: 197,
+			controlPointNextX: 232,
 			controlPointNextY: 194,
 		});
 
@@ -471,8 +468,6 @@ describe('Line controller tests', function() {
 			borderDashOffset: 4.4,
 			borderJoinStyle: 'round',
 			fill: true,
-			skipNull: true,
-			drawNull: false,
 		};
 
 		// point styles
@@ -497,8 +492,6 @@ describe('Line controller tests', function() {
 			borderJoinStyle: 'round',
 			borderWidth: 0.3,
 			fill: true,
-			drawNull: true,
-			skipNull: false,
 			tension: 0.25,
 
 			scaleTop: 0,
@@ -514,20 +507,132 @@ describe('Line controller tests', function() {
 			radius: 2.2,
 			skip: true,
 			tension: 0.15,
-			
+
 			// Point
-			x: 63,
+			x: 81,
 			y: 62,
 
 			// Control points
-			controlPointPreviousX: 63,
+			controlPointPreviousX: 81,
 			controlPointPreviousY: 62,
-			controlPointNextX: 69.75,
+			controlPointNextX: 88.5,
 			controlPointNextY: 54.95,
 		});
 	});
 
-	it ('should handle number of data point changes in update', function() {
+	it ('should fall back to the line styles for points', function() {
+		var data = {
+			datasets: [{
+				data: [0, 0],
+				label: 'dataset2',
+				xAxisID: 'firstXScaleID',
+				yAxisID: 'firstYScaleID',
+
+				// line styles
+				backgroundColor: 'rgb(98, 98, 98)',
+				borderColor: 'rgb(8, 8, 8)',
+				borderWidth: 0.55,
+			}],
+			labels: ['label1', 'label2']
+		};
+		var mockContext = window.createMockContext();
+
+		var VerticalScaleConstructor = Chart.scaleService.getScaleConstructor('linear');
+		var verticalScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		verticalScaleConfig = Chart.helpers.scaleMerge(verticalScaleConfig, Chart.defaults.line.scales.yAxes[0]);
+		var yScale = new VerticalScaleConstructor({
+			ctx: mockContext,
+			options: verticalScaleConfig,
+			chart: {
+				data: data
+			},
+			id: 'firstYScaleID'
+		});
+
+		// Update ticks & set physical dimensions
+		var verticalSize = yScale.update(50, 200);
+		yScale.top = 0;
+		yScale.left = 0;
+		yScale.right = verticalSize.width;
+		yScale.bottom = verticalSize.height;
+
+		var HorizontalScaleConstructor = Chart.scaleService.getScaleConstructor('category');
+		var horizontalScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+		horizontalScaleConfig = Chart.helpers.scaleMerge(horizontalScaleConfig, Chart.defaults.line.scales.xAxes[0]);
+		var xScale = new HorizontalScaleConstructor({
+			ctx: mockContext,
+			options: horizontalScaleConfig,
+			chart: {
+				data: data
+			},
+			id: 'firstXScaleID'
+		});
+
+		// Update ticks & set physical dimensions
+		var horizontalSize = xScale.update(200, 50);
+		xScale.left = yScale.right;
+		xScale.top = yScale.bottom;
+		xScale.right = horizontalSize.width + xScale.left;
+		xScale.bottom = horizontalSize.height + xScale.top;
+
+		var chart = {
+			chartArea: {
+				bottom: 200,
+				left: xScale.left,
+				right: 200,
+				top: 0
+			},
+			data: data,
+			config: {
+				type: 'line'
+			},
+			options: {
+				elements: {
+					line: {
+						backgroundColor: 'rgb(255, 0, 0)',
+						borderCapStyle: 'round',
+						borderColor: 'rgb(0, 255, 0)',
+						borderDash: [],
+						borderDashOffset: 0.1,
+						borderJoinStyle: 'bevel',
+						borderWidth: 1.2,
+						fill: true,
+						tension: 0.1,
+					},
+					point: {
+						backgroundColor: Chart.defaults.global.defaultColor,
+						borderWidth: 1,
+						borderColor: Chart.defaults.global.defaultColor,
+						hitRadius: 1,
+						hoverRadius: 4,
+						hoverBorderWidth: 1,
+						radius: 3,
+					}
+				},
+				scales: {
+					xAxes: [{
+						id: 'firstXScaleID'
+					}],
+					yAxes: [{
+						id: 'firstYScaleID'
+					}]
+				}
+			},
+			scales: {
+				firstXScaleID: xScale,
+				firstYScaleID: yScale,
+			}
+		};
+
+		var controller = new Chart.controllers.line(chart, 0);
+		controller.update();
+
+		expect(chart.data.datasets[0].metaData[0]._model.backgroundColor).toBe('rgb(98, 98, 98)');
+		expect(chart.data.datasets[0].metaData[0]._model.borderColor).toBe('rgb(8, 8, 8)');
+		expect(chart.data.datasets[0].metaData[0]._model.borderWidth).toBe(0.55);
+	});
+
+	it('should handle number of data point changes in update', function() {
 		var data = {
 			datasets: [{
 				data: [10, 15, 0, -4],
@@ -545,7 +650,9 @@ describe('Line controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -562,7 +669,9 @@ describe('Line controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -596,7 +705,6 @@ describe('Line controller tests', function() {
 						borderJoinStyle: 'bevel',
 						borderWidth: 1.2,
 						fill: true,
-						skipNull: true,
 						tension: 0.1,
 					},
 					point: {
@@ -643,7 +751,7 @@ describe('Line controller tests', function() {
 		expect(chart.data.datasets[0].metaData[4] instanceof Chart.elements.Point).toBe(true);
 	});
 
-	it ('should set point hover styles', function() {
+	it('should set point hover styles', function() {
 		var data = {
 			datasets: [{
 				data: [10, 15, 0, -4],
@@ -661,7 +769,9 @@ describe('Line controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -678,7 +788,9 @@ describe('Line controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -777,7 +889,7 @@ describe('Line controller tests', function() {
 		expect(point._model.radius).toBe(4.4);
 	});
 
-	it ('should remove hover styles', function() {
+	it('should remove hover styles', function() {
 		var data = {
 			datasets: [{
 				data: [10, 15, 0, -4],
@@ -795,7 +907,9 @@ describe('Line controller tests', function() {
 		var yScale = new VerticalScaleConstructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstYScaleID'
 		});
 
@@ -812,7 +926,9 @@ describe('Line controller tests', function() {
 		var xScale = new HorizontalScaleConstructor({
 			ctx: mockContext,
 			options: horizontalScaleConfig,
-			data: data,
+			chart: {
+				data: data
+			},
 			id: 'firstXScaleID'
 		});
 
@@ -846,7 +962,6 @@ describe('Line controller tests', function() {
 						borderJoinStyle: 'bevel',
 						borderWidth: 1.2,
 						fill: true,
-						skipNull: true,
 						tension: 0.1,
 					},
 					point: {
@@ -915,4 +1030,4 @@ describe('Line controller tests', function() {
 		expect(point._model.borderWidth).toBe(5.5);
 		expect(point._model.radius).toBe(4.4);
 	});
-});
+});

test/core.helpers.tests.js

@@ -150,17 +150,18 @@ describe('Core helper tests', function() {
 		var merged = helpers.configMerge(baseConfig, toMerge);
 		expect(merged).toEqual({
 			arrayProp: [{
-				prop1: 'myProp1',
-				prop2: 56,
-				prop3: 'prop3'
-			},
-			2, {
-				prop1: 'myProp1'
-			}],
+					prop1: 'myProp1',
+					prop2: 56,
+					prop3: 'prop3'
+				},
+				2, {
+					prop1: 'myProp1'
+				}
+			],
 		});
 	});
 
-	it ('Should merge scale configs', function() {
+	it('Should merge scale configs', function() {
 		var baseConfig = {
 			scales: {
 				prop1: {
@@ -218,7 +219,7 @@ describe('Core helper tests', function() {
 						drawTicks: true, // draw ticks extending towards the label
 						lineWidth: 1,
 						offsetGridLines: false,
-						show: true,
+						display: true,
 						zeroLineColor: "rgba(0,0,0,0.25)",
 						zeroLineWidth: 1,
 					},
@@ -229,7 +230,7 @@ describe('Core helper tests', function() {
 						fontSize: 12,
 						fontStyle: 'normal',
 						labelString: '',
-						show: false,
+						display: false,
 					},
 					ticks: {
 						beginAtZero: false,
@@ -242,8 +243,8 @@ describe('Core helper tests', function() {
 						mirror: false,
 						padding: 10,
 						reverse: false,
-						show: true,
-						template: "<%=value%>"
+						display: true,
+						callback: merged.scales.yAxes[1].ticks.callback, // make it nicer, then check explicitly below
 					},
 					type: 'linear'
 				}, {
@@ -255,7 +256,7 @@ describe('Core helper tests', function() {
 						drawTicks: true, // draw ticks extending towards the label
 						lineWidth: 1,
 						offsetGridLines: false,
-						show: true,
+						display: true,
 						zeroLineColor: "rgba(0,0,0,0.25)",
 						zeroLineWidth: 1,
 					},
@@ -266,7 +267,7 @@ describe('Core helper tests', function() {
 						fontSize: 12,
 						fontStyle: 'normal',
 						labelString: '',
-						show: false,
+						display: false,
 					},
 					ticks: {
 						beginAtZero: false,
@@ -279,26 +280,32 @@ describe('Core helper tests', function() {
 						mirror: false,
 						padding: 10,
 						reverse: false,
-						show: true,
-						template: "<%=value%>"
+						display: true,
+						callback: merged.scales.yAxes[2].ticks.callback, // make it nicer, then check explicitly below
 					},
 					type: 'linear'
 				}]
 			}
 		});
+
+		// Are these actually functions
+		expect(merged.scales.yAxes[1].ticks.callback).toEqual(jasmine.any(Function));
+		expect(merged.scales.yAxes[2].ticks.callback).toEqual(jasmine.any(Function));
 	});
 
-	it ('should get value or default', function() {
+	it('should get value or default', function() {
 		expect(helpers.getValueAtIndexOrDefault(98, 0, 56)).toBe(98);
-		expect(helpers.getValueAtIndexOrDefault(0, 0, 56)).toBe(0); 
+		expect(helpers.getValueAtIndexOrDefault(0, 0, 56)).toBe(0);
 		expect(helpers.getValueAtIndexOrDefault(undefined, undefined, 56)).toBe(56);
 		expect(helpers.getValueAtIndexOrDefault([1, 2, 3], 1, 100)).toBe(2);
 		expect(helpers.getValueAtIndexOrDefault([1, 2, 3], 3, 100)).toBe(100);
 	});
 
-	it ('should filter an array', function() {
+	it('should filter an array', function() {
 		var data = [-10, 0, 6, 0, 7];
-		var callback = function(item) { return item > 2};
+		var callback = function(item) {
+			return item > 2
+		};
 		expect(helpers.where(data, callback)).toEqual([6, 7]);
 		expect(helpers.findNextWhere(data, callback)).toEqual(6);
 		expect(helpers.findNextWhere(data, callback, 2)).toBe(7);
@@ -308,26 +315,26 @@ describe('Core helper tests', function() {
 		expect(helpers.findPreviousWhere(data, callback, 0)).toBe(undefined);
 	});
 
-	it ('Should get the correct sign', function() {
+	it('Should get the correct sign', function() {
 		expect(helpers.sign(0)).toBe(0);
 		expect(helpers.sign(10)).toBe(1);
 		expect(helpers.sign(-5)).toBe(-1);
 	});
 
-	it ('should do a log10 operation', function() {
+	it('should do a log10 operation', function() {
 		expect(helpers.log10(0)).toBe(-Infinity);
 		expect(helpers.log10(1)).toBe(0);
-		expect(helpers.log10(1000)).toBe(3);
+		expect(helpers.log10(1000)).toBeCloseTo(3, 1e-9);
 	});
 
-	it ('Should generate ids', function() {
+	it('Should generate ids', function() {
 		expect(helpers.uid()).toBe('chart-0');
 		expect(helpers.uid()).toBe('chart-1');
 		expect(helpers.uid()).toBe('chart-2');
 		expect(helpers.uid()).toBe('chart-3');
 	});
 
-	it ('should detect a number', function() {
+	it('should detect a number', function() {
 		expect(helpers.isNumber(123)).toBe(true);
 		expect(helpers.isNumber('123')).toBe(true);
 		expect(helpers.isNumber(null)).toBe(false);
@@ -336,37 +343,55 @@ describe('Core helper tests', function() {
 		expect(helpers.isNumber('cbc')).toBe(false);
 	});
 
-	it ('should convert between radians and degrees', function() {
+	it('should convert between radians and degrees', function() {
 		expect(helpers.toRadians(180)).toBe(Math.PI);
 		expect(helpers.toRadians(90)).toBe(0.5 * Math.PI);
 		expect(helpers.toDegrees(Math.PI)).toBe(180);
-		expect(helpers.toDegrees(Math.PI * 3 /2)).toBe(270);
+		expect(helpers.toDegrees(Math.PI * 3 / 2)).toBe(270);
 	});
 
-	it ('should get an angle from a point', function() {
+	it('should get an angle from a point', function() {
 		var center = {
 			x: 0,
 			y: 0
 		};
 
-		expect(helpers.getAngleFromPoint(center, {x: 0, y: 10})).toEqual({
+		expect(helpers.getAngleFromPoint(center, {
+			x: 0,
+			y: 10
+		})).toEqual({
 			angle: Math.PI / 2,
 			distance: 10,
 		});
 
-		expect(helpers.getAngleFromPoint(center, {x: Math.sqrt(2), y: Math.sqrt(2)})).toEqual({
+		expect(helpers.getAngleFromPoint(center, {
+			x: Math.sqrt(2),
+			y: Math.sqrt(2)
+		})).toEqual({
 			angle: Math.PI / 4,
 			distance: 2
 		});
 
-		expect(helpers.getAngleFromPoint(center, {x: -1.0 * Math.sqrt(2), y: -1.0 * Math.sqrt(2)})).toEqual({
+		expect(helpers.getAngleFromPoint(center, {
+			x: -1.0 * Math.sqrt(2),
+			y: -1.0 * Math.sqrt(2)
+		})).toEqual({
 			angle: Math.PI * 1.25,
 			distance: 2
 		});
 	});
 
-	it ('should spline curves', function() {
-		expect(helpers.splineCurve({x: 0, y: 0}, {x: 1, y: 1}, { x: 2, y: 0}, 0)).toEqual({
+	it('should spline curves', function() {
+		expect(helpers.splineCurve({
+			x: 0,
+			y: 0
+		}, {
+			x: 1,
+			y: 1
+		}, {
+			x: 2,
+			y: 0
+		}, 0)).toEqual({
 			previous: {
 				x: 1,
 				y: 1,
@@ -377,7 +402,16 @@ describe('Core helper tests', function() {
 			}
 		});
 
-		expect(helpers.splineCurve({x: 0, y: 0}, {x: 1, y: 1}, { x: 2, y: 0}, 1)).toEqual({
+		expect(helpers.splineCurve({
+			x: 0,
+			y: 0
+		}, {
+			x: 1,
+			y: 1
+		}, {
+			x: 2,
+			y: 0
+		}, 1)).toEqual({
 			previous: {
 				x: 0,
 				y: 1,
@@ -389,7 +423,7 @@ describe('Core helper tests', function() {
 		});
 	});
 
-	it ('should get the next or previous item in an array', function() {
+	it('should get the next or previous item in an array', function() {
 		var testData = [0, 1, 2];
 
 		expect(helpers.nextItem(testData, 0, false)).toEqual(1);
@@ -404,7 +438,7 @@ describe('Core helper tests', function() {
 		expect(helpers.previousItem(testData, 1, true)).toEqual(0);
 	});
 
-	it ('should clear a canvas', function() {
+	it('should clear a canvas', function() {
 		var context = window.createMockContext();
 		helpers.clear({
 			width: 100,
@@ -418,7 +452,7 @@ describe('Core helper tests', function() {
 		}]);
 	});
 
-	it ('should draw a rounded rectangle', function() {
+	it('should draw a rounded rectangle', function() {
 		var context = window.createMockContext();
 		helpers.drawRoundedRectangle(context, 10, 20, 30, 40, 5);
 
@@ -457,4 +491,4 @@ describe('Core helper tests', function() {
 			args: []
 		}])
 	});
-});
+});

test/core.scaleService.tests.js

@@ -0,0 +1,273 @@
+// Tests of the scale service
+describe('Test the scale service', function() {
+	it('should fit a simple chart with 2 scales', function() {
+		var chartInstance = {
+			scales: [],
+		};
+
+		var xScaleID = 'xScale';
+		var yScaleID = 'yScale';
+		var mockData = {
+			datasets: [{
+				yAxisID: yScaleID,
+				data: [10, 5, 0, 25, 78, -10]
+			}],
+			labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5']
+		};
+		var mockContext = window.createMockContext();
+
+		var xScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+		var XConstructor = Chart.scaleService.getScaleConstructor('category');
+		var xScale = new XConstructor({
+			ctx: mockContext,
+			options: xScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: xScaleID
+		});
+
+		var yScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		var YConstructor = Chart.scaleService.getScaleConstructor('linear');
+		var yScale = new YConstructor({
+			ctx: mockContext,
+			options: yScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: yScaleID
+		});
+
+		chartInstance.scales.push(xScale);
+		chartInstance.scales.push(yScale);
+
+		var canvasWidth = 250;
+		var canvasHeight = 150;
+		Chart.scaleService.update(chartInstance, canvasWidth, canvasHeight);
+
+		expect(chartInstance.chartArea).toEqual({
+			left: 55,
+			right: 245,
+			top: 5,
+			bottom: 75.0664716027288,
+		});
+
+		// Is xScale at the right spot
+		expect(xScale.left).toBe(55);
+		expect(xScale.right).toBe(245);
+		expect(xScale.top).toBe(75.0664716027288);
+		expect(xScale.bottom).toBe(145);
+		expect(xScale.labelRotation).toBe(57);
+
+		// Is yScale at the right spot
+		expect(yScale.left).toBe(5);
+		expect(yScale.right).toBe(55);
+		expect(yScale.top).toBe(5);
+		expect(yScale.bottom).toBe(75.0664716027288);
+	});
+
+	it('should fit scales that are in the top and right positions', function() {
+		var chartInstance = {
+			scales: [],
+		};
+
+		var xScaleID = 'xScale';
+		var yScaleID = 'yScale';
+		var mockData = {
+			datasets: [{
+				yAxisID: yScaleID,
+				data: [10, 5, 0, 25, 78, -10]
+			}],
+			labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5']
+		};
+		var mockContext = window.createMockContext();
+
+		var xScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+		xScaleConfig.position = 'top';
+		var XConstructor = Chart.scaleService.getScaleConstructor('category');
+		var xScale = new XConstructor({
+			ctx: mockContext,
+			options: xScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: xScaleID
+		});
+
+		var yScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		yScaleConfig.position = 'right';
+		var YConstructor = Chart.scaleService.getScaleConstructor('linear');
+		var yScale = new YConstructor({
+			ctx: mockContext,
+			options: yScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: yScaleID
+		});
+
+		chartInstance.scales.push(xScale);
+		chartInstance.scales.push(yScale);
+
+		var canvasWidth = 250;
+		var canvasHeight = 150;
+		Chart.scaleService.update(chartInstance, canvasWidth, canvasHeight);
+
+		expect(chartInstance.chartArea).toEqual({
+			left: 5,
+			right: 195,
+			top: 74.9335283972712,
+			bottom: 145,
+		});
+
+		// Is xScale at the right spot
+		expect(xScale.left).toBe(5);
+		expect(xScale.right).toBe(195);
+		expect(xScale.top).toBe(5);
+		expect(xScale.bottom).toBe(74.9335283972712);
+		expect(xScale.labelRotation).toBe(57);
+
+		// Is yScale at the right spot
+		expect(yScale.left).toBe(195);
+		expect(yScale.right).toBe(245);
+		expect(yScale.top).toBe(74.9335283972712);
+		expect(yScale.bottom).toBe(145);
+	});
+
+	it('should fit multiple axes in the same position', function() {
+		var chartInstance = {
+			scales: [],
+		};
+
+		var xScaleID = 'xScale';
+		var yScaleID1 = 'yScale1';
+		var yScaleID2 = 'yScale2';
+		var mockData = {
+			datasets: [{
+				yAxisID: yScaleID1,
+				data: [10, 5, 0, 25, 78, -10]
+			}, {
+				yAxisID: yScaleID2,
+				data: [-19, -20, 0, -99, -50, 0]
+			}],
+			labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5']
+		};
+		var mockContext = window.createMockContext();
+
+		var xScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+		var XConstructor = Chart.scaleService.getScaleConstructor('category');
+		var xScale = new XConstructor({
+			ctx: mockContext,
+			options: xScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: xScaleID
+		});
+
+		var yScaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		var YConstructor = Chart.scaleService.getScaleConstructor('linear');
+		var yScale1 = new YConstructor({
+			ctx: mockContext,
+			options: yScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: yScaleID1
+		});
+		var yScale2 = new YConstructor({
+			ctx: mockContext,
+			options: yScaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: yScaleID2
+		});
+
+		chartInstance.scales.push(xScale);
+		chartInstance.scales.push(yScale1);
+		chartInstance.scales.push(yScale2);
+
+		var canvasWidth = 250;
+		var canvasHeight = 150;
+		Chart.scaleService.update(chartInstance, canvasWidth, canvasHeight);
+
+		expect(chartInstance.chartArea).toEqual({
+			left: 115,
+			right: 245,
+			top: 5,
+			bottom: 68.48521368620018,
+		});
+
+		// Is xScale at the right spot
+		expect(xScale.left).toBe(115);
+		expect(xScale.right).toBe(245);
+		expect(xScale.top).toBe(68.48521368620018);
+		expect(xScale.bottom).toBe(145);
+
+		// Are yScales at the right spot
+		expect(yScale1.left).toBe(5);
+		expect(yScale1.right).toBe(55);
+		expect(yScale1.top).toBe(5);
+		expect(yScale1.bottom).toBe(68.48521368620018);
+
+		expect(yScale2.left).toBe(55);
+		expect(yScale2.right).toBe(115);
+		expect(yScale2.top).toBe(5);
+		expect(yScale2.bottom).toBe(68.48521368620018);
+	});
+
+	// This is an oddball case. What happens is, when the scales are fit the first time they must fit within the assigned size. In this case,
+	// the labels on the xScale need to rotate to fit. However, when the scales are fit again after the width of the left axis is determined, 
+	// the labels do not need to rotate. Previously, the chart was too small because the chartArea did not expand to take up the space freed up 
+	// due to the lack of label rotation
+	it('should fit scales that overlap the chart area', function() {
+		var chartInstance = {
+			scales: [],
+		};
+
+		var scaleID = 'scaleID';
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [10, 5, 0, 25, 78, -10]
+			}, {
+				yAxisID: scaleID,
+				data: [-19, -20, 0, -99, -50, 0]
+			}],
+			labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5']
+		};
+		var mockContext = window.createMockContext();
+
+		var scaleConfig = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('radialLinear'));
+		var ScaleConstructor = Chart.scaleService.getScaleConstructor('radialLinear');
+		var scale = new ScaleConstructor({
+			ctx: mockContext,
+			options: scaleConfig,
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		chartInstance.scales.push(scale);
+
+		var canvasWidth = 300;
+		var canvasHeight = 350;
+		Chart.scaleService.update(chartInstance, canvasWidth, canvasHeight);
+
+		expect(chartInstance.chartArea).toEqual({
+			left: 5,
+			right: 295,
+			top: 5,
+			bottom: 345,
+		});
+
+		expect(scale.left).toBe(5);
+		expect(scale.right).toBe(295);
+		expect(scale.top).toBe(5);
+		expect(scale.bottom).toBe(345);
+		expect(scale.width).toBe(290);
+		expect(scale.height).toBe(340)
+	});
+});

test/scale.category.tests.js

@@ -18,7 +18,7 @@ describe('Category scale tests', function() {
 				drawTicks: true, // draw ticks extending towards the label
 				lineWidth: 1,
 				offsetGridLines: false,
-				show: true,
+				display: true,
 				zeroLineColor: "rgba(0,0,0,0.25)",
 				zeroLineWidth: 1,
 			},
@@ -29,7 +29,7 @@ describe('Category scale tests', function() {
 				fontSize: 12,
 				fontStyle: 'normal',
 				labelString: '',
-				show: false,
+				display: false,
 			},
 			ticks: {
 				beginAtZero: false,
@@ -42,10 +42,13 @@ describe('Category scale tests', function() {
 				mirror: false,
 				padding: 10,
 				reverse: false,
-				show: true,
-				template: "<%=value%>"
+				display: true,
+				callback: defaultConfig.ticks.callback,  // make this nicer, then check explicitly below
 			}
 		});
+
+		// Is this actually a function
+		expect(defaultConfig.ticks.callback).toEqual(jasmine.any(Function));
 	});
 
 	it('Should generate ticks from the data labales', function() {
@@ -64,7 +67,9 @@ describe('Category scale tests', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -90,13 +95,15 @@ describe('Category scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
-		var minSize = scale.update(200, 100);
+		var minSize = scale.update(600, 100);
 
-		expect(scale.width).toBe(200);
+		expect(scale.width).toBe(600);
 		expect(scale.height).toBe(28);
 		expect(scale.paddingTop).toBe(0);
 		expect(scale.paddingBottom).toBe(0);
@@ -105,28 +112,28 @@ describe('Category scale tests', function() {
 		expect(scale.labelRotation).toBe(0);
 
 		expect(minSize).toEqual({
-			width: 200,
+			width: 600,
 			height: 28,
 		});
 
 		scale.left = 5;
 		scale.top = 5;
-		scale.right = 205;
+		scale.right = 605;
 		scale.bottom = 33;
 
 		expect(scale.getPixelForValue(0, 0, 0, false)).toBe(33);
-		expect(scale.getPixelForValue(0, 0, 0, true)).toBe(45);
+		expect(scale.getPixelForValue(0, 0, 0, true)).toBe(85);
 
-		expect(scale.getPixelForValue(0, 4, 0, false)).toBe(132);
-		expect(scale.getPixelForValue(0, 4, 0, true)).toBe(145);
+		expect(scale.getPixelForValue(0, 4, 0, false)).toBe(452);
+		expect(scale.getPixelForValue(0, 4, 0, true)).toBe(505);
 
 		config.gridLines.offsetGridLines = false;
 
 		expect(scale.getPixelForValue(0, 0, 0, false)).toBe(33);
 		expect(scale.getPixelForValue(0, 0, 0, true)).toBe(33);
 
-		expect(scale.getPixelForValue(0, 4, 0, false)).toBe(157);
-		expect(scale.getPixelForValue(0, 4, 0, true)).toBe(157);
+		expect(scale.getPixelForValue(0, 4, 0, false)).toBe(557);
+		expect(scale.getPixelForValue(0, 4, 0, true)).toBe(557);
 	});
 
 	it ('should get the correct pixel for a value when vertical', function() {
@@ -148,7 +155,9 @@ describe('Category scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 

test/scale.linear.tests.js

@@ -17,7 +17,7 @@ describe('Linear Scale', function() {
 				drawTicks: true, // draw ticks extending towards the label
 				lineWidth: 1,
 				offsetGridLines: false,
-				show: true,
+				display: true,
 				zeroLineColor: "rgba(0,0,0,0.25)",
 				zeroLineWidth: 1,
 			},
@@ -28,7 +28,7 @@ describe('Linear Scale', function() {
 				fontSize: 12,
 				fontStyle: 'normal',
 				labelString: '',
-				show: false,
+				display: false,
 			},
 			ticks: {
 				beginAtZero: false,
@@ -41,10 +41,12 @@ describe('Linear Scale', function() {
 				mirror: false,
 				padding: 10,
 				reverse: false,
-				show: true,
-				template: "<%=value%>"
+				display: true,
+				callback: defaultConfig.ticks.callback, // make this work nicer, then check below
 			}
 		});
+
+		expect(defaultConfig.ticks.callback).toEqual(jasmine.any(Function));
 	});
 
 	it('Should correctly determine the max & min data values', function() {
@@ -67,7 +69,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: Chart.scaleService.getScaleDefaults('linear'), // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -84,6 +88,85 @@ describe('Linear Scale', function() {
 		expect(scale.max).toBe(150);
 	});
 
+	it('Should correctly determine the max & min of string data values', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: ['10', '5', '0', '-5', '78', '-100']
+			}, {
+				yAxisID: 'second scale',
+				data: ['-1000', '1000'],
+			}, {
+				yAxisID: scaleID,
+				data: ['150']
+			}]
+		};
+
+		var Constructor = Chart.scaleService.getScaleConstructor('linear');
+		var scale = new Constructor({
+			ctx: {},
+			options: Chart.scaleService.getScaleDefaults('linear'), // use default config for scale
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		expect(scale).not.toEqual(undefined); // must construct
+		expect(scale.min).toBe(undefined); // not yet set
+		expect(scale.max).toBe(undefined);
+
+		// Set arbitrary width and height for now
+		scale.width = 50;
+		scale.height = 400;
+
+		scale.buildTicks();
+		expect(scale.min).toBe(-100);
+		expect(scale.max).toBe(150);
+	});
+
+	it('Should correctly determine the max & min data values ignoring hidden datasets', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [10, 5, 0, -5, 78, -100]
+			}, {
+				yAxisID: 'second scale',
+				data: [-1000, 1000],
+			}, {
+				yAxisID: scaleID,
+				data: [150],
+				hidden: true
+			}]
+		};
+
+		var Constructor = Chart.scaleService.getScaleConstructor('linear');
+		var scale = new Constructor({
+			ctx: {},
+			options: Chart.scaleService.getScaleDefaults('linear'), // use default config for scale
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		expect(scale).not.toEqual(undefined); // must construct
+		expect(scale.min).toBe(undefined); // not yet set
+		expect(scale.max).toBe(undefined);
+
+		// Set arbitrary width and height for now
+		scale.width = 50;
+		scale.height = 400;
+
+		scale.buildTicks();
+		expect(scale.min).toBe(-100);
+		expect(scale.max).toBe(80);
+	});
+
 	it('Should correctly determine the max & min for scatter data', function() {
 		var scaleID = 'myScale';
 
@@ -112,7 +195,9 @@ describe('Linear Scale', function() {
 		var verticalScale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -129,7 +214,9 @@ describe('Linear Scale', function() {
 		var horizontalScale = new Constructor({
 			ctx: {},
 			options: horizontalConfig,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -148,13 +235,19 @@ describe('Linear Scale', function() {
 		var mockData = {
 			datasets: [{
 				yAxisID: scaleID,
-				data: [10, 5, 0, -5, 78, -100]
+				data: [10, 5, 0, -5, 78, -100],
+				type: 'bar'
 			}, {
 				yAxisID: 'second scale',
 				data: [-1000, 1000],
 			}, {
 				yAxisID: scaleID,
-				data: [150, 0, 0, -100, -10, 9]
+				data: [150, 0, 0, -100, -10, 9],
+				type: 'bar'
+			}, {
+				yAxisID: scaleID,
+				data: [10, 10, 10, 10, 10, 10],
+				type: 'line'
 			}]
 		};
 
@@ -165,7 +258,51 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		// Set arbitrary width and height for now
+		scale.width = 50;
+		scale.height = 400;
+
+		scale.buildTicks();
+		expect(scale.min).toBe(-150);
+		expect(scale.max).toBe(200);
+	});
+
+	it('Should correctly determine the min and max data values when stacked mode is turned on and there are hidden datasets', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [10, 5, 0, -5, 78, -100]
+			}, {
+				yAxisID: 'second scale',
+				data: [-1000, 1000],
+			}, {
+				yAxisID: scaleID,
+				data: [150, 0, 0, -100, -10, 9]
+			}, {
+				yAxisID: scaleID,
+				data: [10, 20, 30, 40, 50, 60],
+				hidden: true
+			}]
+		};
+
+		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		config.stacked = true; // enable scale stacked mode
+
+		var Constructor = Chart.scaleService.getScaleConstructor('linear');
+		var scale = new Constructor({
+			ctx: {},
+			options: config,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -190,7 +327,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -203,6 +342,39 @@ describe('Linear Scale', function() {
 		expect(scale.max).toBe(1);
 	});
 
+	it('Should use the suggestedMin and suggestedMax options', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [1, 1, 1, 2, 1, 0]
+			}]
+		};
+
+		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		config.ticks.suggestedMin = -10;
+		config.ticks.suggestedMax = 10;
+
+		var Constructor = Chart.scaleService.getScaleConstructor('linear');
+		var scale = new Constructor({
+			ctx: {},
+			options: config,
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		// Set arbitrary width and height for now
+		scale.width = 50;
+		scale.height = 400;
+
+		scale.buildTicks();
+		expect(scale.min).toBe(-10);
+		expect(scale.max).toBe(10);
+	});
+
 	it('should forcibly include 0 in the range if the beginAtZero option is used', function() {
 		var scaleID = 'myScale';
 
@@ -220,7 +392,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -259,7 +433,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -291,7 +467,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -323,7 +501,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -332,6 +512,33 @@ describe('Linear Scale', function() {
 		expect(scale.ticks).toEqual(['80', '70', '60', '50', '40', '30', '20', '10', '0']);
 	});
 
+	it('should use the correct number of decimal places in the default format function', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [0.06, 0.005, 0, 0.025, 0.0078]
+			}, ]
+		};
+
+		var mockContext = window.createMockContext();
+		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		var Constructor = Chart.scaleService.getScaleConstructor('linear');
+		var scale = new Constructor({
+			ctx: mockContext,
+			options: config,
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		// Set arbitrary width and height for now
+		scale.update(50, 400);
+		expect(scale.ticks).toEqual(['0.06', '0.05', '0.04', '0.03', '0.02', '0.01', '0']);
+	});
+
 	it('Should build labels using the user supplied callback', function() {
 		var scaleID = 'myScale';
 
@@ -343,7 +550,7 @@ describe('Linear Scale', function() {
 		};
 
 		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
-		config.ticks.userCallback = function(value, index) {
+		config.ticks.callback = function(value, index) {
 			return index.toString();
 		};
 
@@ -352,7 +559,9 @@ describe('Linear Scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -379,7 +588,9 @@ describe('Linear Scale', function() {
 		var verticalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -405,7 +616,9 @@ describe('Linear Scale', function() {
 		var horizontalScale = new Constructor({
 			ctx: mockContext,
 			options: horizontalConfig,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -444,16 +657,18 @@ describe('Linear Scale', function() {
 		var verticalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
 		var minSize = verticalScale.update(100, 300);
 		expect(minSize).toEqual({
-			width: 30,
+			width: 40,
 			height: 300,
 		});
-		expect(verticalScale.width).toBe(30);
+		expect(verticalScale.width).toBe(40);
 		expect(verticalScale.height).toBe(300);
 		expect(verticalScale.paddingTop).toBe(6);
 		expect(verticalScale.paddingBottom).toBe(6);
@@ -477,10 +692,10 @@ describe('Linear Scale', function() {
 		expect(verticalScale.paddingRight).toBe(0);
 
 		// Extra size when scale label showing
-		config.scaleLabel.show = true;
+		config.scaleLabel.display = true;
 		minSize = verticalScale.update(100, 300);
 		expect(minSize).toEqual({
-			width: 48,
+			width: 58,
 			height: 300,
 		});
 	});
@@ -500,51 +715,54 @@ describe('Linear Scale', function() {
 		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
 		config.position = "bottom";
 		var Constructor = Chart.scaleService.getScaleConstructor('linear');
-		var verticalScale = new Constructor({
+		var horizontalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
-		var minSize = verticalScale.update(100, 300);
+		var minSize = horizontalScale.update(200, 300);
 		expect(minSize).toEqual({
-			width: 100,
+			width: 200,
 			height: 28,
 		});
-		expect(verticalScale.width).toBe(100);
-		expect(verticalScale.height).toBe(28);
-		expect(verticalScale.paddingTop).toBe(0);
-		expect(verticalScale.paddingBottom).toBe(0);
-		expect(verticalScale.paddingLeft).toBe(18);
-		expect(verticalScale.paddingRight).toBe(13);
+		expect(horizontalScale.width).toBe(200);
+		expect(horizontalScale.height).toBe(28);
+		expect(horizontalScale.paddingTop).toBe(0);
+		expect(horizontalScale.paddingBottom).toBe(0);
+		expect(horizontalScale.paddingLeft).toBe(13);
+		expect(horizontalScale.paddingRight).toBe(8);
+		expect(horizontalScale.labelRotation).toBe(0);
 
 		// Refit with margins to see the padding go away
-		minSize = verticalScale.update(100, 28, {
+		minSize = horizontalScale.update(200, 28, {
 			left: 10,
 			right: 6,
 			top: 15,
 			bottom: 3
 		});
 		expect(minSize).toEqual({
-			width: 100,
+			width: 200,
 			height: 28,
 		});
-		expect(verticalScale.paddingTop).toBe(0);
-		expect(verticalScale.paddingBottom).toBe(0);
-		expect(verticalScale.paddingLeft).toBe(8);
-		expect(verticalScale.paddingRight).toBe(7);
+		expect(horizontalScale.paddingTop).toBe(0);
+		expect(horizontalScale.paddingBottom).toBe(0);
+		expect(horizontalScale.paddingLeft).toBe(3);
+		expect(horizontalScale.paddingRight).toBe(2);
 
 		// Extra size when scale label showing
-		config.scaleLabel.show = true;
-		minSize = verticalScale.update(100, 300);
+		config.scaleLabel.display = true;
+		minSize = horizontalScale.update(200, 300);
 		expect(minSize).toEqual({
-			width: 100,
+			width: 200,
 			height: 46,
 		});
 	});
 
-	it('should draw correctly horizontally', function() {
+	it('Should draw correctly horizontally', function() {
 		var scaleID = 'myScale';
 
 		var mockData = {
@@ -562,12 +780,14 @@ describe('Linear Scale', function() {
 		var horizontalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
-		var minSize = horizontalScale.update(100, 300);
-		minSize = horizontalScale.update(100, 28, {
+		var minSize = horizontalScale.update(200, 300);
+		minSize = horizontalScale.update(200, 28, {
 			left: 10,
 			right: 6,
 			top: 15,
@@ -576,12 +796,12 @@ describe('Linear Scale', function() {
 
 		horizontalScale.left = 0;
 		horizontalScale.right = minSize.width;
-		horizontalScale.top = 0;
-		horizontalScale.bottom = minSize.height;
+		horizontalScale.top = 100;
+		horizontalScale.bottom = 100 + minSize.height;
 
 		var chartArea = {
-			top: 100,
-			bottom: 0,
+			top: 0,
+			bottom: 100,
 			left: 0,
 			right: minSize.width
 		};
@@ -602,16 +822,16 @@ describe('Linear Scale', function() {
 			"args": []
 		}, {
 			"name": "moveTo",
-			"args": [8.5, 0]
+			"args": [3.5, 100]
 		}, {
 			"name": "lineTo",
-			"args": [8.5, 10]
+			"args": [3.5, 110]
 		}, {
 			"name": "moveTo",
-			"args": [8.5, 100]
+			"args": [3.5, 0]
 		}, {
 			"name": "lineTo",
-			"args": [8.5, 0]
+			"args": [3.5, 100]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -620,13 +840,13 @@ describe('Linear Scale', function() {
 			"args": []
 		}, {
 			"name": "translate",
-			"args": [8, 10]
+			"args": [3, 110]
 		}, {
 			"name": "rotate",
 			"args": [-0]
 		}, {
 			"name": "fillText",
-			"args": ["-10", 0, 0]
+			"args": ["-5", 0, 0]
 		}, {
 			"name": "restore",
 			"args": []
@@ -641,16 +861,16 @@ describe('Linear Scale', function() {
 			"args": []
 		}, {
 			"name": "moveTo",
-			"args": [51.5, 0]
+			"args": [101.5, 100]
 		}, {
 			"name": "lineTo",
-			"args": [51.5, 10]
+			"args": [101.5, 110]
 		}, {
 			"name": "moveTo",
-			"args": [51.5, 100]
+			"args": [101.5, 0]
 		}, {
 			"name": "lineTo",
-			"args": [51.5, 0]
+			"args": [101.5, 100]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -659,7 +879,7 @@ describe('Linear Scale', function() {
 			"args": []
 		}, {
 			"name": "translate",
-			"args": [51, 10]
+			"args": [101, 110]
 		}, {
 			"name": "rotate",
 			"args": [-0]
@@ -680,16 +900,16 @@ describe('Linear Scale', function() {
 			"args": []
 		}, {
 			"name": "moveTo",
-			"args": [93.5, 0]
+			"args": [198.5, 100]
 		}, {
 			"name": "lineTo",
-			"args": [93.5, 10]
+			"args": [198.5, 110]
 		}, {
 			"name": "moveTo",
-			"args": [93.5, 100]
+			"args": [198.5, 0]
 		}, {
 			"name": "lineTo",
-			"args": [93.5, 0]
+			"args": [198.5, 100]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -698,13 +918,13 @@ describe('Linear Scale', function() {
 			"args": []
 		}, {
 			"name": "translate",
-			"args": [93, 10]
+			"args": [198, 110]
 		}, {
 			"name": "rotate",
 			"args": [-0]
 		}, {
 			"name": "fillText",
-			"args": ["10", 0, 0]
+			"args": ["5", 0, 0]
 		}, {
 			"name": "restore",
 			"args": []
@@ -714,9 +934,9 @@ describe('Linear Scale', function() {
 		// Turn off some drawing
 		config.gridLines.drawTicks = false;
 		config.gridLines.drawOnChartArea = false;
-		config.ticks.show = false;
-		config.scaleLabel.show = true;
-		config.scaleLabel.labelString = 'myLabel'
+		config.ticks.display = false;
+		config.scaleLabel.display = true;
+		config.scaleLabel.labelString = 'myLabel';
 
 		mockContext.resetCalls();
 
@@ -760,9 +980,12 @@ describe('Linear Scale', function() {
 		}, {
 			"name": "stroke",
 			"args": []
+		}, {
+			"name": "setFillStyle",
+			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["myLabel", 50, 22]
+			"args": ["myLabel", 100, 122]
 		}]);
 
 		// Turn off display
@@ -773,7 +996,7 @@ describe('Linear Scale', function() {
 		expect(mockContext.getCalls()).toEqual([]);
 	});
 
-	it('should draw correctly vertically', function() {
+	it('Should draw correctly vertically', function() {
 		var scaleID = 'myScale';
 
 		var mockData = {
@@ -790,7 +1013,9 @@ describe('Linear Scale', function() {
 		var verticalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -1210,8 +1435,8 @@ describe('Linear Scale', function() {
 		// Turn off some drawing
 		config.gridLines.drawTicks = false;
 		config.gridLines.drawOnChartArea = false;
-		config.ticks.show = false;
-		config.scaleLabel.show = true;
+		config.ticks.display = false;
+		config.scaleLabel.display = true;
 
 		mockContext.resetCalls();
 
@@ -1312,6 +1537,9 @@ describe('Linear Scale', function() {
 		}, {
 			"name": "rotate",
 			"args": [-1.5707963267948966]
+		}, {
+			"name": "setFillStyle",
+			"args": ["#666"]
 		}, {
 			"name": "fillText",
 			"args": ["", 0, 0]
@@ -1320,4 +1548,246 @@ describe('Linear Scale', function() {
 			"args": []
 		}]);
 	});
+
+	it("should not draw lines where the callback function returned null or undefined", function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				xAxisID: scaleID, // for the horizontal scale
+				yAxisID: scaleID,
+				data: [-5, 0, 2, -3, 5]
+			}]
+		};
+		var mockContext = window.createMockContext();
+
+		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('linear'));
+		config.ticks.callback = function(tickValue, index) {
+			return index % 2 === 0 ? null : tickValue.toString();
+		};
+		var Constructor = Chart.scaleService.getScaleConstructor('linear');
+		var verticalScale = new Constructor({
+			ctx: mockContext,
+			options: config,
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		var minSize = verticalScale.update(100, 300);
+		minSize = verticalScale.update(30, 300, {
+			left: 0,
+			right: 0,
+			top: 15,
+			bottom: 3
+		});
+		expect(minSize).toEqual({
+			width: 30,
+			height: 300,
+		});
+
+		verticalScale.left = 0;
+		verticalScale.right = minSize.width;
+		verticalScale.top = 0;
+		verticalScale.bottom = minSize.height;
+
+		var chartArea = {
+			top: 0,
+			bottom: minSize.height,
+			left: minSize.width,
+			right: minSize.width + 100
+		};
+
+		mockContext.resetCalls();
+		verticalScale.draw(chartArea);
+
+		expect(mockContext.getCalls()).toEqual([{
+			"name": "setFillStyle",
+			"args": ["#666"]
+		}, {
+			"name": "setLineWidth",
+			"args": [1]
+		}, {
+			"name": "setStrokeStyle",
+			"args": ["rgba(0, 0, 0, 0.1)"]
+		}, {
+			"name": "beginPath",
+			"args": []
+		}, {
+			"name": "moveTo",
+			"args": [25, 30.2]
+		}, {
+			"name": "lineTo",
+			"args": [30, 30.2]
+		}, {
+			"name": "moveTo",
+			"args": [30, 30.2]
+		}, {
+			"name": "lineTo",
+			"args": [130, 30.2]
+		}, {
+			"name": "stroke",
+			"args": []
+		}, {
+			"name": "save",
+			"args": []
+		}, {
+			"name": "translate",
+			"args": [20, 29.7]
+		}, {
+			"name": "rotate",
+			"args": [-0]
+		}, {
+			"name": "fillText",
+			"args": ["4", 0, 0]
+		}, {
+			"name": "restore",
+			"args": []
+		}, {
+			"name": "beginPath",
+			"args": []
+		}, {
+			"name": "moveTo",
+			"args": [25, 89.6]
+		}, {
+			"name": "lineTo",
+			"args": [30, 89.6]
+		}, {
+			"name": "moveTo",
+			"args": [30, 89.6]
+		}, {
+			"name": "lineTo",
+			"args": [130, 89.6]
+		}, {
+			"name": "stroke",
+			"args": []
+		}, {
+			"name": "save",
+			"args": []
+		}, {
+			"name": "translate",
+			"args": [20, 89.1]
+		}, {
+			"name": "rotate",
+			"args": [-0]
+		}, {
+			"name": "fillText",
+			"args": ["2", 0, 0]
+		}, {
+			"name": "restore",
+			"args": []
+		}, {
+			"name": "setLineWidth",
+			"args": [1]
+		}, {
+			"name": "setStrokeStyle",
+			"args": ["rgba(0,0,0,0.25)"]
+		}, {
+			"name": "beginPath",
+			"args": []
+		}, {
+			"name": "moveTo",
+			"args": [25, 149]
+		}, {
+			"name": "lineTo",
+			"args": [30, 149]
+		}, {
+			"name": "moveTo",
+			"args": [30, 149]
+		}, {
+			"name": "lineTo",
+			"args": [130, 149]
+		}, {
+			"name": "stroke",
+			"args": []
+		}, {
+			"name": "save",
+			"args": []
+		}, {
+			"name": "translate",
+			"args": [20, 148.5]
+		}, {
+			"name": "rotate",
+			"args": [-0]
+		}, {
+			"name": "fillText",
+			"args": ["0", 0, 0]
+		}, {
+			"name": "restore",
+			"args": []
+		}, {
+			"name": "setLineWidth",
+			"args": [1]
+		}, {
+			"name": "setStrokeStyle",
+			"args": ["rgba(0, 0, 0, 0.1)"]
+		}, {
+			"name": "beginPath",
+			"args": []
+		}, {
+			"name": "moveTo",
+			"args": [25, 208.4]
+		}, {
+			"name": "lineTo",
+			"args": [30, 208.4]
+		}, {
+			"name": "moveTo",
+			"args": [30, 208.4]
+		}, {
+			"name": "lineTo",
+			"args": [130, 208.4]
+		}, {
+			"name": "stroke",
+			"args": []
+		}, {
+			"name": "save",
+			"args": []
+		}, {
+			"name": "translate",
+			"args": [20, 207.9]
+		}, {
+			"name": "rotate",
+			"args": [-0]
+		}, {
+			"name": "fillText",
+			"args": ["-2", 0, 0]
+		}, {
+			"name": "restore",
+			"args": []
+		}, {
+			"name": "beginPath",
+			"args": []
+		}, {
+			"name": "moveTo",
+			"args": [25, 267.8]
+		}, {
+			"name": "lineTo",
+			"args": [30, 267.8]
+		}, {
+			"name": "moveTo",
+			"args": [30, 267.8]
+		}, {
+			"name": "lineTo",
+			"args": [130, 267.8]
+		}, {
+			"name": "stroke",
+			"args": []
+		}, {
+			"name": "save",
+			"args": []
+		}, {
+			"name": "translate",
+			"args": [20, 267.3]
+		}, {
+			"name": "rotate",
+			"args": [-0]
+		}, {
+			"name": "fillText",
+			"args": ["-4", 0, 0]
+		}, {
+			"name": "restore",
+			"args": []
+		}])
+	});
 });

test/scale.logarithmic.tests.js

@@ -16,7 +16,7 @@ describe('Logarithmic Scale tests', function() {
 				drawTicks: true,
 				lineWidth: 1,
 				offsetGridLines: false,
-				show: true,
+				display: true,
 				zeroLineColor: "rgba(0,0,0,0.25)",
 				zeroLineWidth: 1,
 			},
@@ -27,7 +27,7 @@ describe('Logarithmic Scale tests', function() {
 				fontSize: 12,
 				fontStyle: 'normal',
 				labelString: '',
-				show: false,
+				display: false,
 			},
 			ticks: {
 				beginAtZero: false,
@@ -40,10 +40,13 @@ describe('Logarithmic Scale tests', function() {
 				mirror: false,
 				padding: 10,
 				reverse: false,
-				show: true,
-				template: "<%var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));if (remain === 1 || remain === 2 || remain === 5) {%><%=value.toExponential()%><%} else {%><%= null %><%}%>",
+				display: true,
+				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
 			},
 		});
+
+		// Is this actually a function
+		expect(defaultConfig.ticks.callback).toEqual(jasmine.any(Function));
 	});
 
 	it('Should correctly determine the max & min data values', function() {
@@ -67,7 +70,82 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: Chart.scaleService.getScaleDefaults('logarithmic'), // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData,
+			},
+			id: scaleID
+		});
+
+		expect(scale).not.toEqual(undefined); // must construct
+		expect(scale.min).toBe(undefined); // not yet set
+		expect(scale.max).toBe(undefined);
+
+		scale.update(400, 400);
+		expect(scale.min).toBe(1);
+		expect(scale.max).toBe(10000);
+	});
+
+	it('Should correctly determine the max & min of string data values', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: ['10', '5', '5000', '78', '450']
+			}, {
+				yAxisID: 'second scale',
+				data: ['1', '1000', '10', '100'],
+			}, {
+				yAxisID: scaleID,
+				data: ['150']
+			}]
+		};
+
+		var mockContext = window.createMockContext();
+		var Constructor = Chart.scaleService.getScaleConstructor('logarithmic');
+		var scale = new Constructor({
+			ctx: mockContext,
+			options: Chart.scaleService.getScaleDefaults('logarithmic'), // use default config for scale
+			chart: {
+				data: mockData,
+			},
+			id: scaleID
+		});
+
+		expect(scale).not.toEqual(undefined); // must construct
+		expect(scale.min).toBe(undefined); // not yet set
+		expect(scale.max).toBe(undefined);
+
+		scale.update(400, 400);
+		expect(scale.min).toBe(1);
+		expect(scale.max).toBe(10000);
+	});
+
+	it('Should correctly determine the max & min data values when there are hidden datasets', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [10, 5, 5000, 78, 450]
+			}, {
+				yAxisID: 'second scale',
+				data: [1, 1000, 10, 100],
+			}, {
+				yAxisID: scaleID,
+				data: [50000],
+				hidden: true
+			}]
+		};
+
+		var mockContext = window.createMockContext();
+		var Constructor = Chart.scaleService.getScaleConstructor('logarithmic');
+		var scale = new Constructor({
+			ctx: mockContext,
+			options: Chart.scaleService.getScaleDefaults('logarithmic'), // use default config for scale
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -109,7 +187,9 @@ describe('Logarithmic Scale tests', function() {
 		var verticalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -122,7 +202,9 @@ describe('Logarithmic Scale tests', function() {
 		var horizontalScale = new Constructor({
 			ctx: mockContext,
 			options: horizontalConfig,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -137,13 +219,19 @@ describe('Logarithmic Scale tests', function() {
 		var mockData = {
 			datasets: [{
 				yAxisID: scaleID,
-				data: [10, 5, 1, 5, 78, 100]
+				data: [10, 5, 1, 5, 78, 100],
+				type: 'bar'
 			}, {
 				yAxisID: 'second scale',
 				data: [-1000, 1000],
 			}, {
 				yAxisID: scaleID,
-				data: [150, 10, 10, 100, 10, 9]
+				data: [150, 10, 10, 100, 10, 9],
+				type: 'bar'
+			}, {
+				yAxisID: scaleID,
+				data: [100, 100, 100, 100, 100, 100],
+				type: 'line'
 			}]
 		};
 
@@ -155,7 +243,52 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
+			id: scaleID
+		});
+
+		scale.update(400, 400);
+		expect(scale.min).toBe(10);
+		expect(scale.max).toBe(1000);
+	});
+
+	it('Should correctly determine the min and max data values when stacked mode is turned on ignoring hidden datasets', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [10, 5, 1, 5, 78, 100],
+				type: 'bar'
+			}, {
+				yAxisID: 'second scale',
+				data: [-1000, 1000],
+				type: 'bar'
+			}, {
+				yAxisID: scaleID,
+				data: [150, 10, 10, 100, 10, 9],
+				type: 'bar'
+			}, {
+				yAxisID: scaleID,
+				data: [10000, 10000, 10000, 10000, 10000, 10000],
+				hidden: true,
+				type: 'bar'
+			}]
+		};
+
+		var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('logarithmic'));
+		config.stacked = true; // enable scale stacked mode
+
+		var mockContext = window.createMockContext();
+		var Constructor = Chart.scaleService.getScaleConstructor('logarithmic');
+		var scale = new Constructor({
+			ctx: mockContext,
+			options: config,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -177,7 +310,9 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -210,7 +345,9 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -243,7 +380,9 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: {},
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -275,7 +414,9 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -304,7 +445,9 @@ describe('Logarithmic Scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -331,7 +474,9 @@ describe('Logarithmic Scale tests', function() {
 		var verticalScale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -356,7 +501,9 @@ describe('Logarithmic Scale tests', function() {
 		var horizontalScale = new Constructor({
 			ctx: mockContext,
 			options: horizontalConfig,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 

test/scale.radialLinear.tests.js

@@ -10,7 +10,7 @@ describe('Test the radial linear scale', function() {
 		var defaultConfig = Chart.scaleService.getScaleDefaults('radialLinear');
 		expect(defaultConfig).toEqual({
 			angleLines: {
-				show: true,
+				display: true,
 				color: "rgba(0, 0, 0, 0.1)",
 				lineWidth: 1
 			},
@@ -22,7 +22,7 @@ describe('Test the radial linear scale', function() {
 				drawTicks: true,
 				lineWidth: 1,
 				offsetGridLines: false,
-				show: true,
+				display: true,
 				zeroLineColor: "rgba(0,0,0,0.25)",
 				zeroLineWidth: 1,
 			},
@@ -40,7 +40,7 @@ describe('Test the radial linear scale', function() {
 				fontSize: 12,
 				fontStyle: 'normal',
 				labelString: '',
-				show: false,
+				display: false,
 			},
 			ticks: {
 				backdropColor: "rgba(255,255,255,0.75)",
@@ -57,11 +57,14 @@ describe('Test the radial linear scale', function() {
 				padding: 10,
 				reverse: false,
 				showLabelBackdrop: true,
-				show: true,
-				template: "<%=value%>",
+				display: true,
+				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
 
 			},
 		});
+
+		// Is this actually a function
+		expect(defaultConfig.ticks.callback).toEqual(jasmine.any(Function));
 	});
 
 	it('Should correctly determine the max & min data values', function() {
@@ -83,7 +86,73 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: Chart.scaleService.getScaleDefaults('radialLinear'), // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
+			id: scaleID,
+		});
+
+		scale.update(200, 300);
+		expect(scale.min).toBe(-100);
+		expect(scale.max).toBe(200);
+	});
+
+	it('Should correctly determine the max & min of string data values', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: ['10', '5', '0', '-5', '78', '-100']
+			}, {
+				yAxisID: scaleID,
+				data: ['150']
+			}],
+			labels: ['lablel1', 'label2', 'label3', 'label4', 'label5', 'label6']
+		};
+
+		var mockContext = window.createMockContext();
+		var Constructor = Chart.scaleService.getScaleConstructor('radialLinear');
+		var scale = new Constructor({
+			ctx: mockContext,
+			options: Chart.scaleService.getScaleDefaults('radialLinear'), // use default config for scale
+			chart: {
+				data: mockData
+			},
+			id: scaleID,
+		});
+
+		scale.update(200, 300);
+		expect(scale.min).toBe(-100);
+		expect(scale.max).toBe(200);
+	});
+
+	it('Should correctly determine the max & min data values when there are hidden datasets', function() {
+		var scaleID = 'myScale';
+
+		var mockData = {
+			datasets: [{
+				yAxisID: scaleID,
+				data: [10, 5, 0, -5, 78, -100]
+			}, {
+				yAxisID: scaleID,
+				data: [150]
+			}, {
+				yAxisID: scaleID,
+				data: [1000],
+				hidden: true
+			}],
+			labels: ['lablel1', 'label2', 'label3', 'label4', 'label5', 'label6']
+		};
+
+		var mockContext = window.createMockContext();
+		var Constructor = Chart.scaleService.getScaleConstructor('radialLinear');
+		var scale = new Constructor({
+			ctx: mockContext,
+			options: Chart.scaleService.getScaleDefaults('radialLinear'), // use default config for scale
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -105,7 +174,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: Chart.scaleService.getScaleDefaults('radialLinear'), // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -131,7 +202,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -170,7 +243,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -203,7 +278,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -230,7 +307,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -240,7 +319,7 @@ describe('Test the radial linear scale', function() {
 		scale.bottom = 305;
 		scale.update(200, 300);
 
-		expect(scale.drawingArea).toBe(36);
+		expect(scale.drawingArea).toBe(37);
 		expect(scale.xCenter).toBe(110);
 		expect(scale.yCenter).toBe(155);
 	});
@@ -262,7 +341,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -273,17 +354,17 @@ describe('Test the radial linear scale', function() {
 		scale.update(200, 300);
 
 		expect(scale.getDistanceFromCenterForValue(scale.min)).toBe(0);
-		expect(scale.getDistanceFromCenterForValue(scale.max)).toBe(36);
+		expect(scale.getDistanceFromCenterForValue(scale.max)).toBe(37);
 		expect(scale.getPointPositionForValue(1, 5)).toEqual({
-			x: 102.13987716166409,
-			y: 149.30471176265638,
+			x: 102,
+			y: 149,
 		});
 
 		config.reverse = true;
 
 		scale.update(200, 300);
 
-		expect(scale.getDistanceFromCenterForValue(scale.min)).toBe(36);
+		expect(scale.getDistanceFromCenterForValue(scale.min)).toBe(37);
 		expect(scale.getDistanceFromCenterForValue(scale.max)).toBe(0);
 	});
 
@@ -305,7 +386,9 @@ describe('Test the radial linear scale', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID,
 		});
 
@@ -349,7 +432,7 @@ describe('Test the radial linear scale', function() {
 			"args": []
 		}, {
 			"name": "arc",
-			"args": [100, 150, 9, 0, 6.283185307179586]
+			"args": [100, 150, 9.25, 0, 6.283185307179586]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -364,13 +447,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 133, 24, 16]
+			"args": [88, 132.75, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["20", 100, 141]
+			"args": ["20", 100, 140.75]
 		}, {
 			"name": "setStrokeStyle",
 			"args": ["rgba(0, 0, 0, 0.1)"]
@@ -382,7 +465,7 @@ describe('Test the radial linear scale', function() {
 			"args": []
 		}, {
 			"name": "arc",
-			"args": [100, 150, 18, 0, 6.283185307179586]
+			"args": [100, 150, 18.5, 0, 6.283185307179586]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -397,13 +480,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 124, 24, 16]
+			"args": [88, 123.5, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["40", 100, 132]
+			"args": ["40", 100, 131.5]
 		}, {
 			"name": "setStrokeStyle",
 			"args": ["rgba(0, 0, 0, 0.1)"]
@@ -415,7 +498,7 @@ describe('Test the radial linear scale', function() {
 			"args": []
 		}, {
 			"name": "arc",
-			"args": [100, 150, 27, 0, 6.283185307179586]
+			"args": [100, 150, 27.75, 0, 6.283185307179586]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -430,13 +513,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 115, 24, 16]
+			"args": [88, 114.25, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["60", 100, 123]
+			"args": ["60", 100, 122.25]
 		}, {
 			"name": "setStrokeStyle",
 			"args": ["rgba(0, 0, 0, 0.1)"]
@@ -448,7 +531,7 @@ describe('Test the radial linear scale', function() {
 			"args": []
 		}, {
 			"name": "arc",
-			"args": [100, 150, 36, 0, 6.283185307179586]
+			"args": [100, 150, 37, 0, 6.283185307179586]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -463,13 +546,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 106, 24, 16]
+			"args": [88, 105, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["80", 100, 114]
+			"args": ["80", 100, 113]
 		}];
 		expect(mockContext.getCalls()).toEqual(expected);
 
@@ -491,16 +574,16 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 141]
 		}, {
 			"name": "lineTo",
-			"args": [108.55950864665638, 147.21884705062547]
+			"args": [109, 147]
 		}, {
 			"name": "lineTo",
-			"args": [105.29006727063226, 157.28115294937453]
+			"args": [105, 157]
 		}, {
 			"name": "lineTo",
-			"args": [94.70993272936774, 157.28115294937453]
+			"args": [95, 157]
 		}, {
 			"name": "lineTo",
-			"args": [91.44049135334362, 147.21884705062547]
+			"args": [91, 147]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -515,13 +598,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 133, 24, 16]
+			"args": [88, 132.75, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["20", 100, 141]
+			"args": ["20", 100, 140.75]
 		}, {
 			"name": "setStrokeStyle",
 			"args": ["rgba(0, 0, 0, 0.1)"]
@@ -536,16 +619,16 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 132]
 		}, {
 			"name": "lineTo",
-			"args": [117.11901729331277, 144.43769410125094]
+			"args": [118, 144]
 		}, {
 			"name": "lineTo",
-			"args": [110.58013454126451, 164.56230589874906]
+			"args": [111, 165]
 		}, {
 			"name": "lineTo",
-			"args": [89.41986545873549, 164.56230589874906]
+			"args": [89, 165]
 		}, {
 			"name": "lineTo",
-			"args": [82.88098270668723, 144.43769410125094]
+			"args": [82, 144]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -560,13 +643,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 124, 24, 16]
+			"args": [88, 123.5, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["40", 100, 132]
+			"args": ["40", 100, 131.5]
 		}, {
 			"name": "setStrokeStyle",
 			"args": ["rgba(0, 0, 0, 0.1)"]
@@ -578,19 +661,19 @@ describe('Test the radial linear scale', function() {
 			"args": []
 		}, {
 			"name": "moveTo",
-			"args": [100, 123]
+			"args": [100, 122]
 		}, {
 			"name": "lineTo",
-			"args": [125.67852593996915, 141.6565411518764]
+			"args": [126, 141]
 		}, {
 			"name": "lineTo",
-			"args": [115.87020181189678, 171.8434588481236]
+			"args": [116, 172]
 		}, {
 			"name": "lineTo",
-			"args": [84.12979818810322, 171.8434588481236]
+			"args": [84, 172]
 		}, {
 			"name": "lineTo",
-			"args": [74.32147406003085, 141.6565411518764]
+			"args": [74, 141]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -605,13 +688,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 115, 24, 16]
+			"args": [88, 114.25, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["60", 100, 123]
+			"args": ["60", 100, 122.25]
 		}, {
 			"name": "setStrokeStyle",
 			"args": ["rgba(0, 0, 0, 0.1)"]
@@ -623,19 +706,19 @@ describe('Test the radial linear scale', function() {
 			"args": []
 		}, {
 			"name": "moveTo",
-			"args": [100, 114]
+			"args": [100, 113]
 		}, {
 			"name": "lineTo",
-			"args": [134.23803458662553, 138.87538820250188]
+			"args": [135, 139]
 		}, {
 			"name": "lineTo",
-			"args": [121.16026908252903, 179.12461179749812]
+			"args": [122, 180]
 		}, {
 			"name": "lineTo",
-			"args": [78.83973091747097, 179.12461179749812]
+			"args": [78, 180]
 		}, {
 			"name": "lineTo",
-			"args": [65.76196541337447, 138.8753882025019]
+			"args": [65, 139]
 		}, {
 			"name": "closePath",
 			"args": []
@@ -650,13 +733,13 @@ describe('Test the radial linear scale', function() {
 			"args": ["rgba(255,255,255,0.75)"]
 		}, {
 			"name": "fillRect",
-			"args": [88, 106, 24, 16]
+			"args": [88, 105, 24, 16]
 		}, {
 			"name": "setFillStyle",
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["80", 100, 114]
+			"args": ["80", 100, 113]
 		}, {
 			"name": "setLineWidth",
 			"args": [1]
@@ -671,7 +754,7 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 150]
 		}, {
 			"name": "lineTo",
-			"args": [65.76196541337447, 138.8753882025019]
+			"args": [65, 139]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -683,7 +766,7 @@ describe('Test the radial linear scale', function() {
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["point5", 61.0066828318987, 137.33030323062715]
+			"args": ["point5", 60, 137]
 		}, {
 			"name": "beginPath",
 			"args": []
@@ -692,7 +775,7 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 150]
 		}, {
 			"name": "lineTo",
-			"args": [78.83973091747097, 179.12461179749812]
+			"args": [78, 180]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -704,7 +787,7 @@ describe('Test the radial linear scale', function() {
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["point4", 75.9008046560086, 183.16969676937285]
+			"args": ["point4", 75, 184]
 		}, {
 			"name": "beginPath",
 			"args": []
@@ -713,7 +796,7 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 150]
 		}, {
 			"name": "lineTo",
-			"args": [121.16026908252903, 179.12461179749812]
+			"args": [122, 180]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -725,7 +808,7 @@ describe('Test the radial linear scale', function() {
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["point3", 124.0991953439914, 183.16969676937285]
+			"args": ["point3", 125, 184]
 		}, {
 			"name": "beginPath",
 			"args": []
@@ -734,7 +817,7 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 150]
 		}, {
 			"name": "lineTo",
-			"args": [134.23803458662553, 138.87538820250188]
+			"args": [135, 139]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -746,7 +829,7 @@ describe('Test the radial linear scale', function() {
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["point2", 138.9933171681013, 137.33030323062715]
+			"args": ["point2", 140, 137]
 		}, {
 			"name": "beginPath",
 			"args": []
@@ -755,7 +838,7 @@ describe('Test the radial linear scale', function() {
 			"args": [100, 150]
 		}, {
 			"name": "lineTo",
-			"args": [100, 114]
+			"args": [100, 113]
 		}, {
 			"name": "stroke",
 			"args": []
@@ -767,7 +850,7 @@ describe('Test the radial linear scale', function() {
 			"args": ["#666"]
 		}, {
 			"name": "fillText",
-			"args": ["point1", 100, 109]
+			"args": ["point1", 100, 108]
 		}]);
 	});
-});
+});

test/scale.time.tests.js

@@ -1,5 +1,10 @@
 // Time scale tests
 describe('Time scale tests', function() {
+
+	it('Should load moment.js as a dependency', function() {
+		expect(window.moment).not.toBe(undefined);
+	});
+
 	it('Should register the constructor with the scale service', function() {
 		var Constructor = Chart.scaleService.getScaleConstructor('time');
 		expect(Constructor).not.toBe(undefined);
@@ -16,7 +21,7 @@ describe('Time scale tests', function() {
 				drawTicks: true,
 				lineWidth: 1,
 				offsetGridLines: false,
-				show: true,
+				display: true,
 				zeroLineColor: "rgba(0,0,0,0.25)",
 				zeroLineWidth: 1,
 			},
@@ -27,7 +32,7 @@ describe('Time scale tests', function() {
 				fontSize: 12,
 				fontStyle: 'normal',
 				labelString: '',
-				show: false,
+				display: false,
 			},
 			ticks: {
 				beginAtZero: false,
@@ -40,19 +45,33 @@ describe('Time scale tests', function() {
 				mirror: false,
 				padding: 10,
 				reverse: false,
-				show: true,
-				template: "<%=value%>"
+				display: true,
+				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
 			},
 			time: {
 				format: false,
 				unit: false,
 				round: false,
 				displayFormat: false,
+				displayFormats: {
+					'millisecond': 'SSS [ms]',
+					'second': 'h:mm:ss a', // 11:20:01 AM
+					'minute': 'h:mm:ss a', // 11:20:01 AM
+					'hour': 'MMM D, hA', // Sept 4, 5PM
+					'day': 'll', // Sep 4 2015
+					'week': 'll', // Week 46, or maybe "[W]WW - YYYY" ?
+					'month': 'MMM YYYY', // Sept 2015
+					'quarter': '[Q]Q - YYYY', // Q3
+					'year': 'YYYY', // 2015
+				},
 			}
 		});
+
+		// Is this actually a function
+		expect(defaultConfig.ticks.callback).toEqual(jasmine.any(Function));
 	});
 
-	it ('should build ticks using days', function() {
+	it('should build ticks using days', function() {
 		var scaleID = 'myScale';
 
 		var mockData = {
@@ -64,7 +83,9 @@ describe('Time scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: Chart.scaleService.getScaleDefaults('time'), // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -75,7 +96,7 @@ describe('Time scale tests', function() {
 		expect(scale.ticks).toEqual(['Jan 1, 2015', 'Jan 2, 2015', 'Jan 3, 2015', 'Jan 4, 2015', 'Jan 5, 2015', 'Jan 6, 2015', 'Jan 7, 2015', 'Jan 8, 2015', 'Jan 9, 2015', 'Jan 10, 2015', 'Jan 11, 2015']);
 	});
 
-	it ('should build ticks using the config unit', function() {
+	it('should build ticks using the config unit', function() {
 		var scaleID = 'myScale';
 
 		var mockData = {
@@ -89,7 +110,9 @@ describe('Time scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config, // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -98,7 +121,7 @@ describe('Time scale tests', function() {
 		expect(scale.ticks).toEqual(['Jan 1, 8PM', 'Jan 1, 9PM', 'Jan 1, 10PM', 'Jan 1, 11PM', 'Jan 2, 12AM', 'Jan 2, 1AM', 'Jan 2, 2AM', 'Jan 2, 3AM', 'Jan 2, 4AM', 'Jan 2, 5AM', 'Jan 2, 6AM', 'Jan 2, 7AM', 'Jan 2, 8AM', 'Jan 2, 9AM', 'Jan 2, 10AM', 'Jan 2, 11AM', 'Jan 2, 12PM', 'Jan 2, 1PM', 'Jan 2, 2PM', 'Jan 2, 3PM', 'Jan 2, 4PM', 'Jan 2, 5PM', 'Jan 2, 6PM', 'Jan 2, 7PM', 'Jan 2, 8PM', 'Jan 2, 9PM']);
 	});
 
-	it ('should build ticks using the config diff', function() {
+	it('should build ticks using the config diff', function() {
 		var scaleID = 'myScale';
 
 		var mockData = {
@@ -113,7 +136,9 @@ describe('Time scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: config, // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -122,11 +147,14 @@ describe('Time scale tests', function() {
 		expect(scale.ticks).toEqual(['Dec 28, 2014', 'Jan 4, 2015', 'Jan 11, 2015', 'Jan 18, 2015', 'Jan 25, 2015', 'Feb 1, 2015', 'Feb 8, 2015', 'Feb 15, 2015']);
 	});
 
-	it ('should get the correct pixel for a value', function() {
+	it('should get the correct pixel for a value', function() {
 		var scaleID = 'myScale';
 
 		var mockData = {
 			labels: ["2015-01-01T20:00:00", "2015-01-02T21:00:00", "2015-01-03T22:00:00", "2015-01-05T23:00:00", "2015-01-07T03:00", "2015-01-08T10:00", "2015-01-10T12:00"], // days
+			datasets: [{
+				data: [],
+			}]
 		};
 
 		var mockContext = window.createMockContext();
@@ -134,7 +162,9 @@ describe('Time scale tests', function() {
 		var scale = new Constructor({
 			ctx: mockContext,
 			options: Chart.scaleService.getScaleDefaults('time'), // use default config for scale
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 
@@ -157,7 +187,9 @@ describe('Time scale tests', function() {
 		var verticalScale = new Constructor({
 			ctx: mockContext,
 			options: verticalScaleConfig,
-			data: mockData,
+			chart: {
+				data: mockData
+			},
 			id: scaleID
 		});
 		verticalScale.update(50, 400);
@@ -171,4 +203,4 @@ describe('Time scale tests', function() {
 		expect(verticalScale.getPixelForValue('', 0, 0)).toBe(6);
 		expect(verticalScale.getPixelForValue('', 6, 0)).toBe(394);
 	});
-});
+});