]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Disable autoskipper for time scales 2015/head
authorEvert Timberg <evert.timberg@gmail.com>
Mon, 15 Feb 2016 14:41:35 +0000 (09:41 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Mon, 15 Feb 2016 14:41:35 +0000 (09:41 -0500)
src/scales/scale.time.js
test/scale.time.tests.js

index 129cdf58c89aee2ee2eb7bcd1ef87d338663c688..629d4125615372d152f9bea90f8026b4c6af43ac 100644 (file)
@@ -65,6 +65,9 @@ module.exports = function(Chart) {
                                'quarter': '[Q]Q - YYYY', // Q3
                                'year': 'YYYY' // 2015
                        }
+               },
+               ticks: {
+                       autoSkip: false,
                }
        };
 
index 777e63ce938ca71c77c27c2d4ffcceb595f2717e..5023295634f00403a4b37e72ff5a4c2997a628f7 100644 (file)
@@ -46,7 +46,7 @@ describe('Time scale tests', function() {
                                reverse: false,
                                display: true,
                                callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below,
-                               autoSkip: true,
+                               autoSkip: false,
                                autoSkipPadding: 20
                        },
                        time: {