Skip to content

Use start and stop plugin hooks instead of beforeInit, afterInit and destroy #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benmccann merged 1 commit into from
Dec 7, 2020
Merged

Use start and stop plugin hooks instead of beforeInit, afterInit and destroy #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions samples/zoom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
<canvas id="canvas"></canvas>
</div>
</div>
<button onclick="window.myScatter.destroy()">Destroy</button>
<button onclick="window.myScatter.destroy(); window.onload(); setButtonText();">Reload</button>
<button id="enablePlugin" onclick="managePlugin(); setButtonText()">Enable</button>
<script>
var randomScalingFactor = function() {
return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
Expand Down Expand Up @@ -132,16 +135,7 @@
}
},
plugins: {
zoom: {
pan: {
enabled: true,
mode: 'xy'
},
zoom: {
enabled: true,
mode: 'xy'
}
}
zoom: false
},
onClick: function(e) {
// eslint-disable-next-line no-alert
Expand All @@ -150,9 +144,29 @@
}
});
};

window.managePlugin = function() {
if (typeof window.myScatter.options.plugins.zoom === 'boolean') {
window.myScatter.options.plugins.zoom = {
pan: {
enabled: true,
mode: 'xy'
},
zoom: {
enabled: true,
mode: 'xy'
}
};
} else {
window.myScatter.options.plugins.zoom = false;
}
window.myScatter.update();
};

window.setButtonText = function() {
document.getElementById('enablePlugin').innerText = window.myScatter.options.plugins.zoom ? 'Disable' : 'Enable';
};
</script>
<button onclick="window.myScatter.destroy()">Destroy</button>
<button onclick="window.myScatter.destroy(); window.onload()">Reload</button>
</body>

</html>
50 changes: 23 additions & 27 deletions src/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,32 +363,7 @@ var zoomPlugin = {
}
},

afterInit: function(chartInstance) {

chartInstance.resetZoom = function() {
storeOriginalOptions(chartInstance);
var originalOptions = chartInstance.$zoom._originalOptions;
helpers.each(chartInstance.scales, function(scale) {

var options = scale.options;
if (originalOptions[scale.id]) {
options.min = originalOptions[scale.id].min;
options.max = originalOptions[scale.id].max;
} else {
delete options.min;
delete options.max;
}
});
chartInstance.update();
};

},

beforeUpdate: function(chart, args, options) {
resolveOptions(chart, options);
},

beforeInit: function(chartInstance, args, pluginOptions) {
start: function(chartInstance, args, pluginOptions) {
chartInstance.$zoom = {
_originalOptions: {}
};
Expand Down Expand Up @@ -601,6 +576,27 @@ var zoomPlugin = {

chartInstance._mc = mc;
}

chartInstance.resetZoom = function() {
storeOriginalOptions(chartInstance);
var originalOptions = chartInstance.$zoom._originalOptions;
helpers.each(chartInstance.scales, function(scale) {

var scaleOptions = scale.options;
if (originalOptions[scale.id]) {
scaleOptions.min = originalOptions[scale.id].min;
scaleOptions.max = originalOptions[scale.id].max;
} else {
delete scaleOptions.min;
delete scaleOptions.max;
}
});
chartInstance.update();
};
},

beforeUpdate: function(chart, args, options) {
resolveOptions(chart, options);
},

beforeDatasetsDraw: function(chartInstance) {
Expand Down Expand Up @@ -647,7 +643,7 @@ var zoomPlugin = {
}
},

destroy: function(chartInstance) {
stop: function(chartInstance) {
if (!chartInstance.$zoom) {
return;
}
Expand Down