Merge pull request #2376 from DaanDeMeyer/fix_scale_default_position

Added default ("left") for position field in global scale defaults (fixes #2370)
chartjs · Apr 26, 2016 · b615fe8 · b615fe8
2 parents 61b30f8 + 73493e2
commit b615fe8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/docs/01-Scales.md b/docs/01-Scales.md
@@ -15,6 +15,7 @@ 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*.
+position | String | "left" | Position of the scale. Possible values are top, left, bottom and right.
 beforeUpdate | Function | undefined | Callback called before the update process starts. Passed a single argument, the scale instance.
 beforeSetDimensions | Function | undefined | Callback that runs before dimensions are set. Passed a single argument, the scale instance.
 afterSetDimensions | Function | undefined | Callback that runs after dimensions are set. Passed a single argument, the scale instance.

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -6,6 +6,7 @@ module.exports = function(Chart) {
 
 	Chart.defaults.scale = {
 		display: true,
+		position: "left",
 
 		// grid line settings
 		gridLines: {