Skip to content

Commit d89c572

Browse files
loicbourgoisloicbourgois
committed
Refactor
1 parent 0d9a74b commit d89c572

File tree

7 files changed

+25
-60
lines changed

7 files changed

+25
-60
lines changed

‎src/controllers/controller.bar.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,6 @@ module.exports = function(Chart) {
487487
? custom.hoverBorderWidth
488488
: helpers.valueAtIndexOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
489489
},
490-
491-
removeHoverStyle: function(element) {
492-
helpers.merge(element._model, element.$previousStyle || {});
493-
delete element.$previousStyle;
494-
},
495490
});
496491

497492
Chart.controllers.horizontalBar = Chart.controllers.bar.extend({

‎src/controllers/controller.bubble.js

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,18 @@ module.exports = function(Chart) {
102102
setHoverStyle: function(point) {
103103
var model = point._model;
104104
var options = point._options;
105-
105+
point.$previousStyle = {
106+
backgroundColor: model.backgroundColor,
107+
borderColor: model.borderColor,
108+
borderWidth: model.borderWidth,
109+
radius: model.radius
110+
};
106111
model.backgroundColor = helpers.valueOrDefault(options.hoverBackgroundColor, helpers.getHoverColor(options.backgroundColor));
107112
model.borderColor = helpers.valueOrDefault(options.hoverBorderColor, helpers.getHoverColor(options.borderColor));
108113
model.borderWidth = helpers.valueOrDefault(options.hoverBorderWidth, options.borderWidth);
109114
model.radius = options.radius + options.hoverRadius;
110115
},
111116

112-
/**
113-
* @protected
114-
*/
115-
removeHoverStyle: function(point) {
116-
var model = point._model;
117-
var options = point._options;
118-
119-
model.backgroundColor = options.backgroundColor;
120-
model.borderColor = options.borderColor;
121-
model.borderWidth = options.borderWidth;
122-
model.radius = options.radius;
123-
},
124-
125117
/**
126118
* @private
127119
*/

‎src/controllers/controller.doughnut.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,7 @@ module.exports = function(Chart) {
247247
},
248248

249249
removeHoverStyle: function(element) {
250-
Chart.DatasetController.prototype.removeHoverStyle.call(this, element, this.chart.options.elements.arc);
251-
},
252-
253-
/* removeHoverStyle: function(element, elementOpts) {
254-
elementOpts = elementOpts || {};
250+
var elementOpts = this.chart.options.elements.arc;
255251
var dataset = this.chart.data.datasets[element._datasetIndex];
256252
var index = element._index;
257253
var custom = element.custom || {};
@@ -261,7 +257,7 @@ module.exports = function(Chart) {
261257
model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
262258
model.borderColor = custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
263259
model.borderWidth = custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
264-
},*/
260+
},
265261

266262
calculateTotal: function() {
267263
var dataset = this.getDataset();

‎src/controllers/controller.line.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,15 +313,18 @@ module.exports = function(Chart) {
313313
radius: model.radius
314314
};
315315

316-
model.backgroundColor = custom.hoverBackgroundColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
317-
model.borderColor = custom.hoverBorderColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
318-
model.borderWidth = custom.hoverBorderWidth || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
319-
model.radius = custom.hoverRadius || helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
320-
},
321-
322-
removeHoverStyle: function(element) {
323-
helpers.merge(element._model, element.$previousStyle || {});
324-
delete element.$previousStyle;
316+
model.backgroundColor
317+
= custom.hoverBackgroundColor
318+
|| helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
319+
model.borderColor
320+
= custom.hoverBorderColor
321+
|| helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
322+
model.borderWidth
323+
= custom.hoverBorderWidth
324+
|| helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
325+
model.radius
326+
= custom.hoverRadius
327+
|| helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
325328
},
326329
});
327330
};

‎src/controllers/controller.polarArea.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,8 @@ module.exports = function(Chart) {
193193
arc.pivot();
194194
},
195195

196-
removeHoverStyle: function(arc) {
197-
Chart.DatasetController.prototype.removeHoverStyle.call(this, arc, this.chart.options.elements.arc);
198-
},
199-
200-
/* removeHoverStyle: function(element, elementOpts) {
201-
elementOpts = elementOpts || {};
196+
removeHoverStyle: function(element) {
197+
var elementOpts = this.chart.options.elements.arc;
202198
var dataset = this.chart.data.datasets[element._datasetIndex];
203199
var index = element._index;
204200
var custom = element.custom || {};
@@ -208,7 +204,7 @@ module.exports = function(Chart) {
208204
model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
209205
model.borderColor = custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
210206
model.borderWidth = custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
211-
}, */
207+
},
212208

213209
countVisibleElements: function() {
214210
var dataset = this.getDataset();

‎src/controllers/controller.radar.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,5 @@ module.exports = function(Chart) {
170170
? custom.hoverBorderWidth
171171
: helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
172172
},
173-
174-
removeHoverStyle: function(element) {
175-
helpers.merge(element._model, element.$previousStyle || {});
176-
delete element.$previousStyle;
177-
},
178173
});
179174
};

‎src/core/core.datasetController.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -238,22 +238,10 @@ module.exports = function(Chart) {
238238
}
239239
},
240240

241-
removeHoverStyle: function(element, elementOpts) {
242-
elementOpts = elementOpts || {};
243-
var dataset = this.chart.data.datasets[element._datasetIndex];
244-
var index = element._index;
245-
var custom = element.custom || {};
246-
var valueOrDefault = helpers.valueAtIndexOrDefault;
247-
var model = element._model;
248-
249-
model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
250-
model.borderColor = custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
251-
model.borderWidth = custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
252-
},
253-
/*removeHoverStyle: function(element) {
241+
removeHoverStyle: function(element) {
254242
helpers.merge(element._model, element.$previousStyle || {});
255243
delete element.$previousStyle;
256-
},*/
244+
},
257245

258246
setHoverStyle: function(element) {
259247
var dataset = this.chart.data.datasets[element._datasetIndex];

0 commit comments

Comments
 (0)