Merge `Chart.scales` into `Chart.scaleService` to be consistent

diff --git a/src/charts/chart.bar.js b/src/charts/chart.bar.js
index 358a5fe016a59b1022a54a0dd8a3735367fee377..e16161bb220bb9ea9ebc771c7de7f1cd2bd4c910 100644 (file)
--- a/src/charts/chart.bar.js
+++ b/src/charts/chart.bar.js
@@ -220,7 +220,7 @@
             this.scales = {};
 
             // Build the x axis. The line chart only supports a single x axis
-            var ScaleClass = Chart.scales.getScaleConstructor(this.options.scales.xAxes[0].type);
+            var ScaleClass = Chart.scaleService.getScaleConstructor(this.options.scales.xAxes[0].type);
             var xScale = new ScaleClass({
                 ctx: this.chart.ctx,
                 options: this.options.scales.xAxes[0],
@@ -231,7 +231,7 @@
 
             // Build up all the y scales
             helpers.each(this.options.scales.yAxes, function(yAxisOptions) {
-                var ScaleClass = Chart.scales.getScaleConstructor(yAxisOptions.type);
+                var ScaleClass = Chart.scaleService.getScaleConstructor(yAxisOptions.type);
                 var scale = new ScaleClass({
                     ctx: this.chart.ctx,
                     options: yAxisOptions,

diff --git a/src/charts/chart.line.js b/src/charts/chart.line.js
index d68a9964e16087c058ff86468ce11dc17f90027a..779f78e3f66b4174b0fb6e666dafd71e1cb7c44a 100644 (file)
--- a/src/charts/chart.line.js
+++ b/src/charts/chart.line.js
@@ -344,7 +344,7 @@
 
                        // Build the x axes
                        helpers.each(this.options.scales.xAxes, function(xAxisOptions) {
-                               var ScaleClass = Chart.scales.getScaleConstructor(xAxisOptions.type);
+                               var ScaleClass = Chart.scaleService.getScaleConstructor(xAxisOptions.type);
                                var scale = new ScaleClass({
                                        ctx: this.chart.ctx,
                                        options: xAxisOptions,
@@ -357,7 +357,7 @@
 
                        // Build the y axes
                        helpers.each(this.options.scales.yAxes, function(yAxisOptions) {
-                               var ScaleClass = Chart.scales.getScaleConstructor(yAxisOptions.type);
+                               var ScaleClass = Chart.scaleService.getScaleConstructor(yAxisOptions.type);
                                var scale = new ScaleClass({
                                        ctx: this.chart.ctx,
                                        options: yAxisOptions,

diff --git a/src/charts/chart.polarArea.js b/src/charts/chart.polarArea.js
index 72f4b8f76682c7caf49c8cfd53c4f8153c8419f7..4131e6bc01c0b2924ccc9b5c8a3ed24ef4348987 100644 (file)
--- a/src/charts/chart.polarArea.js
+++ b/src/charts/chart.polarArea.js
@@ -66,7 +66,7 @@
 
                        // Scale setup
                        var self = this;
-                       var ScaleClass = Chart.scales.getScaleConstructor(this.options.scale.type);
+                       var ScaleClass = Chart.scaleService.getScaleConstructor(this.options.scale.type);
                        this.scale = new ScaleClass({
                                options: this.options.scale,
                                lineArc: true,

diff --git a/src/charts/chart.radar.js b/src/charts/chart.radar.js
index 2fcf88ba050d94aa44c1594675d1b721e9d3314b..3d911070f94d0d94ece152e0535604fffb3f9064 100644 (file)
--- a/src/charts/chart.radar.js
+++ b/src/charts/chart.radar.js
@@ -302,7 +302,7 @@
                buildScale: function() {
                        var self = this;
 
-                       var ScaleConstructor = Chart.scales.getScaleConstructor(this.options.scale.type);
+                       var ScaleConstructor = Chart.scaleService.getScaleConstructor(this.options.scale.type);
                        this.scale = new ScaleConstructor({
                                options: this.options.scale,
                                height: this.chart.height,

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 3d56f6346908a980ba9cb119d36aa822920bd3d1..dc9a9a7025224d837d6b0272cf84c4377de57218 100644 (file)
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -9,6 +9,18 @@
     // a service where scales are registered with their respective charts so that changing the 
     // scales does not require 
     Chart.scaleService = {
+        // Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
+        // use the new chart options to grab the correct scale
+        constructors: {},
+        // Use a registration function so that we can move to an ES6 map when we no longer need to support
+        // old browsers
+        registerScaleType: function(type, scaleConstructor) {
+            this.constructors[type] = scaleConstructor;
+        },
+        getScaleConstructor: function(type) {
+            return this.constructors.hasOwnProperty(type) ? this.constructors[type] : undefined;
+        },
+
         // The interesting function
         fitScalesForChart: function(chartInstance, width, height) {
             var xPadding = width > 30 ? 5 : 2;
@@ -287,19 +299,4 @@
             }
         }
     };
-
-    // Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
-    // use the new chart options to grab the correct scale
-    Chart.scales = {
-        constructors: {},
-        // Use a registration function so that we can move to an ES6 map when we no longer need to support
-        // old browsers
-        registerScaleType: function(type, scaleConstructor) {
-            this.constructors[type] = scaleConstructor;
-        },
-        getScaleConstructor: function(type) {
-            return this.constructors.hasOwnProperty(type) ? this.constructors[type] : undefined;
-        }
-    };
-
 }).call(this);

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 9ce5e00f4b98dc1470c25bf9b1492509ff2eea45..7ed54613ec918ad3b8899116b6307fa838d37a83 100644 (file)
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -233,8 +233,5 @@
                        }
                }
        });
-       Chart.scales.registerScaleType("category", DatasetScale);
-
-
-
+       Chart.scaleService.registerScaleType("category", DatasetScale);
 }).call(this);

diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index 11e1bdfc247aabeab7893d7fc570d262d4c184d0..fd4e6d80034c0f155896c93bcfd265c5e44b7196 100644 (file)
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -523,7 +523,6 @@
                        }
                }
        });
-       Chart.scales.registerScaleType("linear", LinearScale);
-
-
+       Chart.scaleService.registerScaleType("linear", LinearScale);
+       
 }).call(this);

diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
index 7bcda29c942d976dc8b58f67d3f0105c30600814..9d8e30eff45cc0474a85889607eb2cb061f2f597 100644 (file)
--- a/src/scales/scale.radialLinear.js
+++ b/src/scales/scale.radialLinear.js
@@ -374,7 +374,7 @@
                        }
                }
        });
-       Chart.scales.registerScaleType("radialLinear", LinearRadialScale);
+       Chart.scaleService.registerScaleType("radialLinear", LinearRadialScale);
 
 
 }).call(this);