Changed time unit formatting. Minor fixes.

chartjs · May 30, 2017 · db3bdbd · db3bdbd
1 parent 7254e90
commit db3bdbd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -687,8 +687,7 @@ module.exports = function(Chart) {
 						// Add bold style to major units
 						var tickMoment = moment(me.ticksAsTimestamps[index]);
 						var tickMomentClone = tickMoment.clone();
-						if (me.majorUnit &&
-							tickMoment.valueOf() === tickMomentClone.startOf(me.majorUnit).valueOf()) {
+						if (me.majorUnit && tickMoment.valueOf() === tickMomentClone.startOf(me.majorUnit).valueOf()) {
 							font = majorTickFont;
 						}
 					}

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -25,7 +25,7 @@ module.exports = function(Chart) {
 			displayFormats: {
 				millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM,
 				second: 'h:mm:ss a', // 11:20:01 AM
-				minute: 'h:mm:ss a', // 11:20:01 AM
+				minute: 'h:mm a', // 11:20 AM
 				hour: 'hA', // 5PM
 				day: 'MMM D', // Sep 4
 				week: 'll', // Week 46, or maybe "[W]WW - YYYY" ?

diff --git a/test/specs/scale.time.tests.js b/test/specs/scale.time.tests.js
@@ -96,7 +96,7 @@ describe('Time scale tests', function() {
 				displayFormats: {
 					millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM
 					second: 'h:mm:ss a', // 11:20:01 AM
-					minute: 'h:mm:ss a', // 11:20:01 AM
+					minute: 'h:mm a', // 11:20 AM
 					hour: 'hA', // 5PM
 					day: 'MMM D', // Sep 4
 					week: 'll', // Week 46, or maybe "[W]WW - YYYY" ?