]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Fix time point lines. Improved logic for using the value in the time scale. Improve... 2918/head
authorEvert Timberg <evert.timberg+github@gmail.com>
Wed, 6 Jul 2016 00:52:17 +0000 (20:52 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Wed, 6 Jul 2016 00:52:17 +0000 (20:52 -0400)
src/controllers/controller.bubble.js
src/controllers/controller.line.js
src/scales/scale.time.js

index 9d2d1f2c1b55d315f563e764511cc61a4c028e9d..49aa50078595e34abe45a9f8e32d49cc7f8c6352 100644 (file)
@@ -73,7 +73,7 @@ module.exports = function(Chart) {
 
                                // Desired view properties
                                _model: {
-                                       x: reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(data, index, dsIndex, me.chart.isCombo),
+                                       x: reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(typeof data === 'object' ? data : NaN, index, dsIndex, me.chart.isCombo),
                                        y: reset ? yScale.getBasePixel() : yScale.getPixelForValue(data, index, dsIndex),
                                        // Appearance
                                        radius: reset ? 0 : custom.radius ? custom.radius : me.getRadius(data),
index f3d7328d431b3ff1a9ea497c9c2b3a9ecce94f88..b5bf201681124c85fabbacc6fa034c4a29255bd4 100644 (file)
@@ -181,7 +181,7 @@ module.exports = function(Chart) {
                                dataset.pointHitRadius = dataset.hitRadius;
                        }
 
-                       x = xScale.getPixelForValue(value, index, datasetIndex, me.chart.isCombo);
+                       x = xScale.getPixelForValue(typeof value === 'object' ? value : NaN, index, datasetIndex, me.chart.isCombo);
                        y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex);
 
                        // Utility
index 6affaebe83d4726a05a1f205c0ce079c05c5e39e..c409947782362972bf34f38a76de24d0c56436da 100755 (executable)
@@ -327,7 +327,10 @@ module.exports = function(Chart) {
                },
                getPixelForValue: function(value, index, datasetIndex) {
                        var me = this;
-                       value = moment(value);
+                       if (!value || !value.isValid) {
+                               // not already a moment object
+                               value = moment(me.getRightValue(value));
+                       }
                        var labelMoment = value && value.isValid && value.isValid() ? value : me.getLabelMoment(datasetIndex, index);
 
                        if (labelMoment) {