Skip to content

Commit

Permalink
prefix moved private methods with underscore
Browse files Browse the repository at this point in the history
  • Loading branch information
kurkle committed Jan 16, 2019
1 parent 4abdc59 commit bacc5e9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions src/controllers/controller.bar.js
Expand Up @@ -173,7 +173,7 @@ module.exports = DatasetController.extend({
_updateElementGeometry: function(rectangle, index, reset) {
var me = this;
var model = rectangle._model;
var vscale = me.getValueScale();
var vscale = me._getValueScale();
var base = vscale.getBasePixel();
var horizontal = vscale.isHorizontal();
var ruler = me._ruler || me.getRuler();
Expand All @@ -197,7 +197,7 @@ module.exports = DatasetController.extend({
_getStacks: function(last) {
var me = this;
var chart = me.chart;
var scale = me.getIndexScale();
var scale = me._getIndexScale();
var stacked = scale.options.stacked;
var ilen = last === undefined ? chart.data.datasets.length : last + 1;
var stacks = [];
Expand Down Expand Up @@ -247,7 +247,7 @@ module.exports = DatasetController.extend({
*/
getRuler: function() {
var me = this;
var scale = me.getIndexScale();
var scale = me._getIndexScale();
var stackCount = me.getStackCount();
var datasetIndex = me.index;
var isHorizontal = scale.isHorizontal();
Expand Down Expand Up @@ -282,7 +282,7 @@ module.exports = DatasetController.extend({
var me = this;
var chart = me.chart;
var meta = me.getMeta();
var scale = me.getValueScale();
var scale = me._getValueScale();
var isHorizontal = scale.isHorizontal();
var datasets = chart.data.datasets;
var value = +scale.getRightValue(datasets[datasetIndex].data[index]);
Expand All @@ -298,7 +298,7 @@ module.exports = DatasetController.extend({

if (imeta.bar &&
imeta.stack === stack &&
imeta.controller.getValueScaleId() === scale.id &&
imeta.controller._getValueScaleId() === scale.id &&
chart.isDatasetVisible(i)) {

ivalue = +scale.getRightValue(datasets[i].data[index]);
Expand Down Expand Up @@ -357,7 +357,7 @@ module.exports = DatasetController.extend({
draw: function() {
var me = this;
var chart = me.chart;
var scale = me.getValueScale();
var scale = me._getValueScale();
var rects = me.getMeta().data;
var dataset = me.getDataset();
var ilen = rects.length;
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/controller.horizontalBar.js
Expand Up @@ -65,14 +65,14 @@ module.exports = BarController.extend({
/**
* @private
*/
getValueScaleId: function() {
_getValueScaleId: function() {
return this.getMeta().xAxisID;
},

/**
* @private
*/
getIndexScaleId: function() {
_getIndexScaleId: function() {
return this.getMeta().yAxisID;
}
});
Expand Down
12 changes: 6 additions & 6 deletions src/core/core.datasetController.js
Expand Up @@ -134,29 +134,29 @@ helpers.extend(DatasetController.prototype, {
/**
* @private
*/
getValueScaleId: function() {
_getValueScaleId: function() {
return this.getMeta().yAxisID;
},

/**
* @private
*/
getIndexScaleId: function() {
_getIndexScaleId: function() {
return this.getMeta().xAxisID;
},

/**
* @private
*/
getValueScale: function() {
return this.getScaleForId(this.getValueScaleId());
_getValueScale: function() {
return this.getScaleForId(this._getValueScaleId());
},

/**
* @private
*/
getIndexScale: function() {
return this.getScaleForId(this.getIndexScaleId());
_getIndexScale: function() {
return this.getScaleForId(this._getIndexScaleId());
},

reset: function() {
Expand Down
2 changes: 1 addition & 1 deletion src/scales/scale.category.js
Expand Up @@ -51,7 +51,7 @@ module.exports = Scale.extend({
var me = this;
var chart = me.chart;

if (chart.getDatasetMeta(datasetIndex).controller.getValueScaleId() === me.id) {
if (chart.getDatasetMeta(datasetIndex).controller._getValueScaleId() === me.id) {
return me.getRightValue(chart.data.datasets[datasetIndex].data[index]);
}

Expand Down

0 comments on commit bacc5e9

Please sign in to comment.