From 998c6939bfc7fb898f8dc4ef2690a103bfe38062 Mon Sep 17 00:00:00 2001 From: etimberg Date: Wed, 16 Mar 2016 19:59:20 -0400 Subject: [PATCH] Instead of showing a warning on load, throw an error on create if moment is not defined. --- src/scales/scale.time.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 66bd891d3..7e5b7c387 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -7,12 +7,6 @@ moment = typeof(moment) === 'function' ? moment : window.moment; module.exports = function(Chart) { var helpers = Chart.helpers; - - if (!moment) { - console.warn('Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at http://momentjs.com/'); - return; - } - var time = { units: [{ name: 'millisecond', @@ -73,6 +67,13 @@ module.exports = function(Chart) { }; var TimeScale = Chart.Scale.extend({ + initialize: function() { + if (!moment) { + throw new Error('Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com'); + } + + Chart.Scale.prototype.initialize.call(this); + }, getLabelMoment: function(datasetIndex, index) { return this.labelMoments[datasetIndex][index]; }, -- 2.47.2