archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Update spelling of cancellable (#8236)" (#8312)

Browse Source 
This reverts commit e6dfc47927508c79aa5495be65e8bda32fffddcf.
This commit is contained in:
Ben McCann 2021-01-16 11:14:15 -08:00 committed by GitHub
parent 32b3242585
commit 00dbe71dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/core.controller.js
View File

@ -462,7 +462,7 @@ class Chart {
// https://github.com/chartjs/Chart.js/issues/5111#issuecomment-355934167
me._plugins.invalidate();
if (me.notifyPlugins('beforeUpdate', {mode, cancellable: true}) === false) {
if (me.notifyPlugins('beforeUpdate', {mode, cancelable: true}) === false) {
return;
}
@ -508,7 +508,7 @@ class Chart {
_updateLayout() {
const me = this;
if (me.notifyPlugins('beforeLayout', {cancellable: true}) === false) {
if (me.notifyPlugins('beforeLayout', {cancelable: true}) === false) {
return;
}
@ -548,7 +548,7 @@ class Chart {
const me = this;
const isFunction = typeof mode === 'function';
if (me.notifyPlugins('beforeDatasetsUpdate', {mode, cancellable: true}) === false) {
if (me.notifyPlugins('beforeDatasetsUpdate', {mode, cancelable: true}) === false) {
return;
}
@ -567,7 +567,7 @@ class Chart {
_updateDataset(index, mode) {
const me = this;
const meta = me.getDatasetMeta(index);
const args = {meta, index, mode, cancellable: true};
const args = {meta, index, mode, cancelable: true};
if (me.notifyPlugins('beforeDatasetUpdate', args) === false) {
return;
@ -575,13 +575,13 @@ class Chart {
meta.controller._update(mode);
args.cancellable = false;
args.cancelable = false;
me.notifyPlugins('afterDatasetUpdate', args);
}
render() {
const me = this;
if (me.notifyPlugins('beforeRender', {cancellable: true}) === false) {
if (me.notifyPlugins('beforeRender', {cancelable: true}) === false) {
return;
}
@ -609,7 +609,7 @@ class Chart {
return;
}
if (me.notifyPlugins('beforeDraw', {cancellable: true}) === false) {
if (me.notifyPlugins('beforeDraw', {cancelable: true}) === false) {
return;
}
@ -666,7 +666,7 @@ class Chart {
_drawDatasets() {
const me = this;
if (me.notifyPlugins('beforeDatasetsDraw', {cancellable: true}) === false) {
if (me.notifyPlugins('beforeDatasetsDraw', {cancelable: true}) === false) {
return;
}
@ -691,7 +691,7 @@ class Chart {
const args = {
meta,
index: meta.index,
cancellable: true
cancelable: true
};
if (me.notifyPlugins('beforeDatasetDraw', args) === false) {
@ -709,7 +709,7 @@ class Chart {
unclipArea(ctx);
args.cancellable = false;
args.cancelable = false;
me.notifyPlugins('afterDatasetDraw', args);
}
@ -1024,7 +1024,7 @@ class Chart {
*/
_eventHandler(e, replay) {
const me = this;
const args = {event: e, replay, cancellable: true};
const args = {event: e, replay, cancelable: true};
if (me.notifyPlugins('beforeEvent', args) === false) {
return;
@ -1032,7 +1032,7 @@ class Chart {
const changed = me._handleEvent(e, replay);
args.cancellable = false;
args.cancelable = false;
me.notifyPlugins('afterEvent', args);
if (changed || args.changed) {

2
src/core/core.plugins.js
View File

@ -50,7 +50,7 @@ export default class PluginService {
const plugin = descriptor.plugin;
const method = plugin[hook];
const params = [chart, args, descriptor.options];
if (callCallback(method, params, plugin) === false && args.cancellable) {
if (callCallback(method, params, plugin) === false && args.cancelable) {
return false;
}
}

2
test/specs/core.plugin.tests.js
View File

@ -151,7 +151,7 @@ describe('Chart.plugins', function() {
spyOn(plugin, 'hook').and.callThrough();
});
var ret = chart.notifyPlugins('hook', {cancellable: true});
var ret = chart.notifyPlugins('hook', {cancelable: true});
expect(ret).toBeFalsy();
expect(plugins[0].hook).toHaveBeenCalled();
expect(plugins[1].hook).toHaveBeenCalled();